texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Sat, 1 Jan 2022 05:43:09 -0500 (EST)

branch: master
commit 9b9be96b2661f1df370af00a49bb1b9f72ea91af
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 1 10:31:59 2022 +0100

    Remove duplicate informations in test results
---
 tp/TODO                                            |   2 +
 .../results/converters_tests/at_commands_in_raw.pl |   6 +-
 tp/t/results/converters_tests/complex_nestings.pl  |   6 +-
 .../results/converters_tests/footnote_no_number.pl |   6 +-
 .../footnote_no_number_separate.pl                 |   6 +-
 tp/t/results/converters_tests/image_formatting.pl  |   6 +-
 .../index_entry_in_preformatted.pl                 |   6 +-
 .../printindex_merged_indices_code_style.pl        |   6 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl | 107 +---
 tp/t/results/converters_tests/refs_formatting.pl   |  16 +-
 .../some_at_commands_in_ref_nodes.pl               |  43 +-
 .../converters_tests/spaces_in_empty_node_names.pl |  17 +-
 .../converters_tests/spaces_in_node_names.pl       |  35 +-
 .../converters_tests/test_deftypefnnewline.pl      |  29 +-
 .../converters_tests/things_before_setfilename.pl  |  34 +-
 .../things_before_setfilename_no_element.pl        |  18 -
 tp/t/results/converters_tests/top_in_ref.pl        |   9 +-
 .../converters_tests/top_in_ref_keep_top.pl        |   9 +-
 tp/t/results/coverage/block_commands.pl            |   9 -
 .../coverage/punctuation_in_line_commands.pl       |  38 +-
 tp/t/results/coverage_braces/caption_not_closed.pl |   9 -
 tp/t/results/coverage_braces/footnote_no_node.pl   |   4 +-
 .../coverage_braces/inforef_too_much_args.pl       |   6 +-
 tp/t/results/coverage_braces/test_image.pl         |  15 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  43 +-
 .../two_footnotes_in_nodes_separate.pl             |  43 +-
 tp/t/results/coverage_braces/verb_in_xref.pl       |   6 +-
 .../def/all_commands_delimiters_printindex.pl      |   6 +-
 tp/t/results/def/all_commands_printindex.pl        |   6 +-
 tp/t/results/def/ref_in_def.pl                     |   6 +-
 tp/t/results/def/space_in_def_for_index.pl         |   6 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  54 +-
 .../docbook_tests/special_docbook_unnumbered.pl    |  91 +--
 tp/t/results/float/anchor_in_caption.pl            |  15 +-
 tp/t/results/float/cindex_in_caption.pl            |  15 +-
 .../results/float/comment_space_comand_in_float.pl |  15 +-
 tp/t/results/float/complex_float.pl                |  75 +--
 .../float/empty_listoffloats_with_floats.pl        |  34 --
 tp/t/results/float/float_copying.pl                |  52 +-
 tp/t/results/float/float_with_at_commands.pl       |   9 -
 tp/t/results/float/footnote_in_caption.pl          |  15 +-
 .../results/float/footnote_in_caption_and_error.pl |  15 +-
 .../float/numbering_captions_listoffloats.pl       | 413 ++-----------
 tp/t/results/float/ref_to_float.pl                 |  18 -
 tp/t/results/float/simple.pl                       |   9 -
 tp/t/results/formats_encodings/accent.pl           |  16 +-
 .../formats_encodings/accent_enable_encoding.pl    |  16 +-
 tp/t/results/formats_encodings/accentenc.pl        |  16 +-
 .../formats_encodings/accentenc_enable_encoding.pl |  16 +-
 .../formats_encodings/at_commands_in_refs.pl       | 459 +++++----------
 .../at_commands_in_refs_latin1.pl                  | 459 +++++----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 459 +++++----------
 .../char_latin1_latin1_in_refs.pl                  | 107 +---
 .../formats_encodings/char_latin1_utf8_in_refs.pl  | 107 +---
 .../char_latin2_latin2_in_refs.pl                  |  43 +-
 .../formats_encodings/japanese_shift_jis.pl        |  59 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  75 +--
 tp/t/results/formats_encodings/weird_accents.pl    |  16 +-
 .../weird_accents_disable_encoding.pl              |  16 +-
 tp/t/results/formatting/cond.pl                    |   6 +-
 .../results/formatting/cond_ifhtml_ifinfo_iftex.pl |   6 +-
 tp/t/results/formatting/cond_info.pl               |   6 +-
 .../formatting/cond_info_ifhtml_ifinfo_iftex.pl    |   6 +-
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |   6 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   6 +-
 tp/t/results/formatting/cond_xml.pl                |   6 +-
 .../formatting/direntry_dircategory_info_split.pl  |  43 +-
 .../formatting/documentlanguage_set_option.pl      |  16 +-
 .../formatting/documentlanguage_set_option_info.pl |  16 +-
 .../formatting/documentlanguage_set_unknown.pl     |  16 +-
 tp/t/results/formatting/float_copying.pl           |  52 +-
 .../formatting/simplest_test_date_in_header.pl     |   6 +-
 tp/t/results/formatting/simplest_test_prefix.pl    |   6 +-
 .../formatting/simplest_test_prefix_info.pl        |   6 +-
 .../formatting/split_for_format_not_split.pl       |   6 +-
 tp/t/results/formatting/split_nocopying.pl         |  43 +-
 tp/t/results/formatting/split_nocopying_split.pl   |  43 +-
 tp/t/results/formatting/texi_bib_example.pl        |  59 +-
 tp/t/results/formatting/texi_cond.pl               |   6 +-
 tp/t/results/formatting/texi_glossary.pl           |  43 +-
 tp/t/results/heading/heading_in_copying.pl         |   6 +-
 .../character_number_leading_toc_stoc.pl           |  16 +-
 tp/t/results/html_tests/check_htmlxref.pl          |  33 +-
 .../deftypefnnewline_for_copying_after.pl          |  16 +-
 .../deftypefnnewline_for_copying_before.pl         |  16 +-
 tp/t/results/html_tests/documentdescription.pl     |   4 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |  16 +-
 .../html_tests/footnotestyle_separate_late.pl      |  81 +--
 tp/t/results/html_tests/html_in_copying.pl         |  16 +-
 .../results/html_tests/index_and_node_same_name.pl |  10 +-
 tp/t/results/html_tests/index_below.pl             |  24 +-
 tp/t/results/html_tests/redirection_same_labels.pl | 141 ++---
 tp/t/results/html_tests/ref_in_preformatted.pl     |  23 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |  12 +-
 tp/t/results/html_tests/simple_menu.pl             |  20 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  43 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  43 +-
 .../text_before_top_and_contents_after_title.pl    |  20 +-
 ...t_before_top_and_summarycontents_after_title.pl |  20 +-
 tp/t/results/html_tests/titles.pl                  |  16 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  72 +--
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  72 +--
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  72 +--
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  72 +--
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  72 +--
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  72 +--
 tp/t/results/include/cpp_lines.pl                  |   6 +-
 .../macro_and_commands_in_early_commands.pl        |  16 +-
 tp/t/results/include/macro_in_early_commands.pl    |  16 +-
 tp/t/results/include/value_expansion_in_include.pl |   6 +-
 tp/t/results/indices/complex_recursive_synindex.pl |   6 +-
 tp/t/results/indices/def_syn_indices.pl            |  29 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |   6 +-
 tp/t/results/indices/double_index_entry.pl         |  23 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  29 +-
 tp/t/results/indices/double_syncodeindex.pl        |   6 +-
 tp/t/results/indices/empty_cindex_entry.pl         |   6 +-
 tp/t/results/indices/empty_index_entry.pl          |   6 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   6 +-
 tp/t/results/indices/encoding_index_ascii.pl       |  16 +-
 .../encoding_index_ascii_enable_encoding.pl        |  16 +-
 tp/t/results/indices/encoding_index_latin1.pl      |  16 +-
 .../encoding_index_latin1_enable_encoding.pl       |  16 +-
 tp/t/results/indices/encoding_index_utf8.pl        |  16 +-
 .../indices/encoding_index_utf8_enable_encoding.pl |  16 +-
 tp/t/results/indices/explicit_sort_key.pl          |   9 +-
 tp/t/results/indices/ftable_vtable.pl              |   6 +-
 tp/t/results/indices/image_lines_count.pl          |   6 +-
 tp/t/results/indices/image_text_lines_count.pl     |   6 +-
 tp/t/results/indices/index_entries_locations.pl    |   6 +-
 .../indices/index_entry_before_first_node.pl       | Bin 9505 -> 9431 bytes
 tp/t/results/indices/index_entry_before_node.pl    |  29 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |   6 +-
 .../index_entry_in_footnote_different_node_end.pl  |  23 +-
 .../indices/index_entry_in_footnote_separate.pl    |  23 +-
 tp/t/results/indices/print_merged_index.pl         |   6 +-
 .../indices/printindex_index_entry_in_copying.pl   |  43 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  43 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  43 +-
 .../indices/printindex_with_space_before.pl        | Bin 9074 -> 9000 bytes
 .../indices/same_index_entry_merged_indices.pl     |   9 +-
 tp/t/results/indices/seealso_duplicate.pl          |   6 +-
 tp/t/results/indices/seeentry.pl                   |  22 +-
 tp/t/results/indices/subentries.pl                 |  22 +-
 tp/t/results/indices/subentry_and_sortas.pl        |  22 +-
 tp/t/results/indices/syncode_index_print_both.pl   |  29 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   6 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   9 +-
 tp/t/results/indices/w_lines_count.pl              |   9 +-
 tp/t/results/info_tests/anchor_and_spaces.pl       |  16 +-
 tp/t/results/info_tests/anchor_in_command.pl       |   6 +-
 tp/t/results/info_tests/before_node_and_section.pl |  43 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   6 +-
 tp/t/results/info_tests/def_in_copying.pl          |  16 +-
 .../direntry_dircategory_and_commands.pl           |  16 +-
 tp/t/results/info_tests/encoding_us_ascii.pl       |   6 +-
 tp/t/results/info_tests/error_in_footnote.pl       |  15 +-
 tp/t/results/info_tests/file_only_png.pl           | Bin 6892 -> 6818 bytes
 tp/t/results/info_tests/float_long_captions.pl     |  24 +-
 tp/t/results/info_tests/image_and_punctuation.pl   |   6 +-
 .../info_tests/image_and_spaces_formatting.pl      |   6 +-
 tp/t/results/info_tests/image_extension.pl         |   6 +-
 tp/t/results/info_tests/image_in_paragraph.pl      | Bin 6599 -> 6525 bytes
 tp/t/results/info_tests/image_not_found.pl         |   6 +-
 tp/t/results/info_tests/image_quotes.pl            | Bin 5373 -> 5299 bytes
 tp/t/results/info_tests/index_entry_at_end_node.pl |  59 +-
 .../info_tests/invalid_node_name_no_warning.pl     |  35 +-
 .../info_tests/invalid_node_name_warning.pl        |  35 +-
 tp/t/results/info_tests/known_encoding.pl          |   6 +-
 .../multitable_anchor_and_index_entry.pl           |   6 +-
 .../info_tests/nested_footnotes_separate.pl        |   6 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   6 +-
 tp/t/results/info_tests/no_node_but_top.pl         |   4 +-
 tp/t/results/info_tests/no_top_node.pl             |   6 +-
 tp/t/results/info_tests/note_in_strong.pl          |   6 +-
 .../info_tests/note_in_strong_end_of_line.pl       |   6 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |   6 +-
 .../info_tests/paragraphindent_and_preamble.pl     |  16 +-
 tp/t/results/info_tests/pxref_test.pl              |   6 +-
 tp/t/results/info_tests/ref_tests.pl               |   6 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |  17 +-
 tp/t/results/info_tests/space_in_menu.pl           |  43 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |   6 +-
 tp/t/results/info_tests/split_no_copying.pl        |  43 +-
 .../info_tests/split_test_before_first_node.pl     |  43 +-
 .../split_test_before_first_node_no_empty_line.pl  |  43 +-
 tp/t/results/info_tests/test_index.pl              |  79 +--
 tp/t/results/info_tests/text_before_node.pl        |  43 +-
 tp/t/results/info_tests/top_node_normalization.pl  |  17 +-
 tp/t/results/info_tests/unknown_encoding.pl        |   6 +-
 tp/t/results/info_tests/xref_test.pl               |   6 +-
 .../invalid_nestings/float_in_style_command.pl     |   9 -
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |   6 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |   6 +-
 tp/t/results/invalid_nestings/in_table.pl          |   6 +-
 .../invalid_nestings/menu_in_style_command.pl      |  17 +-
 tp/t/results/invalid_nestings/node_in_copying.pl   |   6 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |  16 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |   6 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |   6 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   4 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |   6 +-
 tp/t/results/invalid_nestings/ref_in_anchor.pl     |   6 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |   6 +-
 .../results/invalid_nestings/section_in_copying.pl |   4 +-
 .../invalid_nestings/section_in_flushright.pl      |   4 +-
 .../invalid_nestings/section_in_footnote.pl        |   4 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |   8 +-
 .../section_in_nested_block_commands.pl            |   4 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |   4 +-
 .../invalid_nestings/section_on_def_line.pl        |   4 +-
 .../invalid_nestings/section_on_defx_line.pl       |   4 +-
 .../section_on_index_entry_line.pl                 |   4 +-
 .../style_not_closed_before_first_node.pl          |   6 +-
 .../style_not_closed_no_newline_root_commands.pl   |  43 +-
 .../style_not_closed_root_commands.pl              |  43 +-
 .../unclosed_verb_on_section_line.pl               |   4 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |   6 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  29 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  29 +-
 tp/t/results/languages/appendix_translated.pl      |  20 +-
 tp/t/results/languages/command_translated.pl       |  16 +-
 tp/t/results/languages/multiple.pl                 |   6 +-
 tp/t/results/languages/multiple_lang_chapters.pl   | 107 +---
 .../languages/multiple_lang_chapters_latex.pl      | 107 +---
 .../languages/multiple_lang_chapters_texi2html.pl  | 107 +---
 tp/t/results/languages/simple.pl                   |   6 +-
 tp/t/results/languages/unknown_language.pl         |  16 +-
 tp/t/results/languages/unknown_region.pl           |   6 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  29 +-
 tp/t/results/latex_tests/custom_headings.pl        |  41 +-
 tp/t/results/latex_tests/float_and_refs.pl         |  68 +--
 tp/t/results/latex_tests/fonttextsize.pl           |  49 +-
 tp/t/results/latex_tests/indices.pl                |  29 +-
 tp/t/results/latex_tests/pagesizes.pl              |  33 +-
 tp/t/results/latex_tests/pagetype.pl               |  33 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |   4 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |  29 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  29 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  29 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  29 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  29 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  29 +-
 .../titlepage_with_commands_classical.pl           |  29 +-
 tp/t/results/layout/navigation.pl                  |  97 +--
 tp/t/results/layout/navigation_chapter.pl          |  97 +--
 .../results/layout/navigation_chapter_no_header.pl |  97 +--
 .../navigation_chapter_no_header_vertical.pl       |  97 +--
 tp/t/results/layout/navigation_chapter_vertical.pl |  97 +--
 tp/t/results/layout/navigation_no_header.pl        |  97 +--
 .../layout/navigation_no_header_vertical.pl        |  97 +--
 tp/t/results/layout/navigation_node.pl             |  97 +--
 tp/t/results/layout/navigation_node_no_header.pl   |  97 +--
 .../layout/navigation_node_no_header_vertical.pl   |  97 +--
 tp/t/results/layout/navigation_node_vertical.pl    |  97 +--
 tp/t/results/layout/navigation_section.pl          |  97 +--
 .../results/layout/navigation_section_no_header.pl |  97 +--
 .../navigation_section_no_header_vertical.pl       |  97 +--
 tp/t/results/layout/navigation_section_vertical.pl |  97 +--
 tp/t/results/layout/navigation_vertical.pl         |  97 +--
 tp/t/results/layout/no_monolithic.pl               |  43 +-
 tp/t/results/macro/backslash_in_arg.pl             |   6 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   6 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  43 +-
 .../menu/block_commands_in_menu_description.pl     |  27 +-
 tp/t/results/menu/comment_on_menu_line.pl          |  34 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        | 129 ++--
 tp/t/results/menu/detailmenu_unknown_node.pl       |  17 +-
 .../menu/direntry_dircategory_after_first_node.pl  |  16 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |  17 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |  29 +-
 tp/t/results/menu/example_in_menu_description.pl   |  27 +-
 tp/t/results/menu/formats_in_menu.pl               |  17 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |  27 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |  17 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   6 +-
 tp/t/results/menu/menu_in_example.pl               |   6 +-
 tp/t/results/menu/menu_node_unterminated.pl        |  17 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |  27 +-
 tp/t/results/menu/menu_title_before_entries.pl     |  23 +-
 tp/t/results/menu/multiple_menus.pl                |  28 +-
 tp/t/results/menu/no_colon_in_menu.pl              |  17 +-
 tp/t/results/menu/reference_to_external_manual.pl  |  17 +-
 tp/t/results/menu/sc_in_menu.pl                    |  23 +-
 tp/t/results/menu/submenu_in_example.pl            |   6 +-
 tp/t/results/menu/verb_in_menu_description.pl      |  27 +-
 .../codequoteundirected_codequotebacktick.pl       |  16 +-
 .../misc_commands/comment_space_command_on_line.pl |  29 +-
 .../no_empty_line_between_headings.pl              |  12 +-
 tp/t/results/misc_commands/ref_in_center.pl        |   6 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |   6 +-
 .../misc_commands/text_before_line_command.pl      |  16 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  83 +--
 tp/t/results/morecoverage/texi_formatting.pl       |  83 +--
 tp/t/results/moreindices/double_index_entry.pl     |  23 +-
 tp/t/results/moreindices/index_no_node.pl          |  20 +-
 tp/t/results/moreindices/index_split.pl            | 173 ++----
 tp/t/results/moreindices/index_split_nodes.pl      | 173 ++----
 tp/t/results/moreindices/nodes_before_top.pl       |  80 +--
 .../nodes_before_top_and_sections_monolithic.pl    | 102 +---
 .../moreindices/nodes_before_top_no_nodes.pl       |  80 +--
 tp/t/results/moreindices/nodes_before_top_nodes.pl |  80 +--
 tp/t/results/moreindices/split_chapter_index.pl    |  97 +--
 tp/t/results/moresectioning/equivalent_nodes.pl    |  32 +-
 .../moresectioning/equivalent_nodes_no_node.pl     |  32 +-
 .../moresectioning/more_sections_than_nodes.pl     | 134 ++---
 tp/t/results/moresectioning/node_footnote_end.pl   |  62 +-
 .../moresectioning/node_footnote_separated.pl      |  62 +-
 .../moresectioning/node_footnote_use_node.pl       |  62 +-
 .../nodes_after_top_before_chapter.pl              |  39 +-
 ...s_after_top_before_chapter_use_nodes_chapter.pl |  39 +-
 .../nodes_after_top_before_section.pl              |  39 +-
 .../nodes_after_top_before_section_use_nodes.pl    |  39 +-
 ...s_after_top_before_section_use_nodes_chapter.pl |  39 +-
 .../moresectioning/placed_things_before_element.pl |  13 +-
 tp/t/results/moresectioning/sectioning_frames.pl   | 221 ++-----
 .../results/moresectioning/top_node_up_explicit.pl |  43 +-
 .../results/moresectioning/top_node_up_implicit.pl |  43 +-
 .../moresectioning/two_footnotes_in_nodes.pl       |  43 +-
 .../two_footnotes_in_nodes_separated.pl            |  43 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |   9 -
 tp/t/results/plaintext_tests/all_spaces.pl         |   6 +-
 .../plaintext_tests/chinese_mixed_with_en.pl       |   6 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  59 +-
 .../plaintext_tests/line_passed_and_formats.pl     |  17 +-
 .../plaintext_tests/no_empty_line_after_section.pl |  16 +-
 tp/t/results/plaintext_tests/non_break_spaces.pl   |   6 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  84 +--
 tp/t/results/preformatted/caption_in_example.pl    |   9 -
 tp/t/results/regions/anchor_in_copying.pl          |   6 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   6 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |  10 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |  10 +-
 tp/t/results/regions/format_in_titlepage.pl        |   6 +-
 .../regions/format_in_titlepage_titlepage.pl       |   6 +-
 tp/t/results/regions/ref_in_copying.pl             |  43 +-
 tp/t/results/regions/today_in_copying.pl           |  16 +-
 tp/t/results/sectioning/a_comma_after_node.pl      |   6 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |  43 +-
 .../sectioning/anchor_in_footnote_separate.pl      |  43 +-
 tp/t/results/sectioning/anchor_zero.pl             |   6 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |   6 +-
 .../sectioning/chapter_before_and_after_part.pl    |  21 +-
 tp/t/results/sectioning/chapter_before_part.pl     |  16 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  47 +-
 .../chapter_node_before_and_after_part.pl          |  49 +-
 tp/t/results/sectioning/chapter_sections.pl        |  64 +-
 .../sectioning/character_and_spaces_in_node.pl     |  18 +-
 .../sectioning/character_and_spaces_in_refs.pl     |  72 +--
 .../sectioning/character_and_spaces_in_refs_out.pl | 112 +---
 tp/t/results/sectioning/complex.pl                 | 403 ++++---------
 tp/t/results/sectioning/complex_split_at_node.pl   | 412 ++++---------
 tp/t/results/sectioning/contents.pl                |  42 +-
 .../sectioning/contents_and_shortcontents.pl       |  42 +-
 .../sectioning/contents_at_document_begin.pl       |  20 +-
 .../results/sectioning/contents_at_end_document.pl |  20 +-
 .../contents_at_end_document_after_node.pl         |  37 +-
 tp/t/results/sectioning/contents_in_document.pl    |  20 +-
 tp/t/results/sectioning/contents_in_html_text.pl   |  16 +-
 tp/t/results/sectioning/contents_no_section.pl     |   6 +-
 .../sectioning/contents_with_only_top_node.pl      |   6 +-
 .../results/sectioning/double_node_anchor_float.pl |  33 +-
 tp/t/results/sectioning/double_part.pl             |  93 +--
 tp/t/results/sectioning/double_top.pl              |   6 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |  17 +-
 tp/t/results/sectioning/double_top_section.pl      |   8 +-
 tp/t/results/sectioning/email_in_node.pl           |   6 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |   6 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |  33 +-
 tp/t/results/sectioning/equivalent_labels.pl       |  35 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |  23 +-
 .../results/sectioning/explicit_node_directions.pl |  38 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  56 +-
 tp/t/results/sectioning/hole_in_sectioning.pl      |  20 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |  50 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  47 +-
 tp/t/results/sectioning/loop_nodes.pl              |  67 +--
 tp/t/results/sectioning/lowered_subsubsection.pl   | 158 ++---
 tp/t/results/sectioning/loweredheading.pl          |   3 +-
 tp/t/results/sectioning/menutextorder.pl           | 119 +---
 .../results/sectioning/more_sections_than_nodes.pl | 134 ++---
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  97 +--
 tp/t/results/sectioning/next_no_prev_to_node.pl    |  29 +-
 .../results/sectioning/no_argument_and_contents.pl |   8 +-
 tp/t/results/sectioning/no_element.pl              |   9 -
 tp/t/results/sectioning/no_menu.pl                 |  48 +-
 tp/t/results/sectioning/node_empty_direction.pl    |   6 +-
 tp/t/results/sectioning/node_line_arguments.pl     |   6 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |  17 +-
 .../sectioning/node_part_chapter_after_chapter.pl  | 104 +---
 .../sectioning/node_part_chapter_after_top.pl      |  77 +--
 tp/t/results/sectioning/node_referenced_in_ref.pl  |  23 +-
 .../node_sectop_before_chapter_no_node.pl          |  20 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  32 +-
 tp/t/results/sectioning/node_too_much_args.pl      |   6 +-
 .../node_up_direction_for_top_with_manual.pl       |   6 +-
 tp/t/results/sectioning/node_up_external_node.pl   |  29 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  72 +--
 .../nodes_after_top_before_chapter_nodes.pl        |  62 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  39 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  39 +-
 .../nodes_after_top_before_chapter_sections.pl     |  56 +-
 .../nodes_after_top_before_section_nodes.pl        |  62 +-
 .../nodes_after_top_before_section_sections.pl     |  56 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  29 +-
 .../sectioning/nodes_before_after_top_xref.pl      |  29 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  60 +-
 .../nodes_no_node_top_explicit_directions.pl       |  29 +-
 .../non_automatic_internal_top_node_up.pl          |  50 +-
 .../non_automatic_top_node_up_and_url.pl           |  50 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |  74 +--
 tp/t/results/sectioning/novalidate.pl              |  17 +-
 .../one_node_explicit_directions_anchor.pl         |   6 +-
 tp/t/results/sectioning/one_subsection.pl          |   4 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |  16 +-
 tp/t/results/sectioning/part_before_chapter.pl     |  13 +-
 tp/t/results/sectioning/part_before_section.pl     |  13 +-
 tp/t/results/sectioning/part_before_top.pl         |  13 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  77 +--
 tp/t/results/sectioning/part_chapter_appendix.pl   |  10 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  63 +-
 tp/t/results/sectioning/part_node_before_top.pl    |  59 +-
 .../sectioning/part_node_chapter_after_top.pl      |  86 +--
 .../sectioning/part_node_chapter_appendix.pl       |  93 +--
 .../sectioning/part_node_chapter_node_appendix.pl  | 104 +---
 .../sectioning/part_node_node_part_appendix.pl     | 116 ++--
 tp/t/results/sectioning/part_node_part_appendix.pl | 104 +---
 .../sectioning/part_node_part_node_appendix.pl     | 116 ++--
 .../sectioning/placed_things_before_element.pl     |  13 +-
 .../sectioning/placed_things_before_node.pl        |  25 +-
 .../sectioning/protected_node_parentheses.pl       |  33 +-
 tp/t/results/sectioning/raiselowersections.pl      | 130 +---
 tp/t/results/sectioning/rec_nodes.pl               |  57 +-
 tp/t/results/sectioning/ref_to_top.pl              |  16 +-
 .../sectioning/section_before_after_top_node.pl    |  24 +-
 .../section_before_after_top_node_last_node.pl     |  27 +-
 tp/t/results/sectioning/section_before_chapter.pl  |   8 +-
 tp/t/results/sectioning/section_before_part.pl     |   8 +-
 tp/t/results/sectioning/section_before_top.pl      |  43 +-
 .../sectioning/section_before_top_no_node.pl       |   8 +-
 .../results/sectioning/section_below_unnumbered.pl |  70 +--
 .../sectioning/section_below_unnumbered_no_top.pl  |   8 +-
 .../sectioning/section_chapter_before_top.pl       |  12 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  70 +--
 .../sectioning/section_in_unnumbered_info.pl       | 655 ++++++---------------
 .../sectioning/section_in_unnumbered_plaintext.pl  | 655 ++++++---------------
 .../results/sectioning/section_node_before_part.pl |  20 +-
 .../results/sectioning/sectioning_part_appendix.pl |  85 +--
 .../sectioning/sectioning_part_appendix_no_top.pl  |  77 +--
 tp/t/results/sectioning/sections.pl                |   4 +-
 tp/t/results/sectioning/sections_test.pl           |  42 +-
 .../sectioning/sections_test_no_use_nodes.pl       |  42 +-
 ...ctions_test_no_use_nodes_use_node_directions.pl |  42 +-
 tp/t/results/sectioning/semi_auto.pl               |  86 +--
 .../setfilename_on_top_and_after_node.pl           |  16 +-
 tp/t/results/sectioning/shortcontents.pl           |  42 +-
 tp/t/results/sectioning/space_in_node.pl           |  35 +-
 tp/t/results/sectioning/top_chapter_sections.pl    |  72 +--
 .../results/sectioning/top_no_argument_and_node.pl |   9 +-
 .../sectioning/top_no_argument_and_top_node.pl     |   9 +-
 .../sectioning/top_node_no_menu_direction.pl       |  23 +-
 tp/t/results/sectioning/top_node_part_top.pl       |  39 +-
 tp/t/results/sectioning/top_node_up_url.pl         |  50 +-
 tp/t/results/sectioning/top_part_chapter.pl        |  21 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  39 +-
 .../sectioning/top_without_node_sections.pl        |  51 +-
 .../transliterated_split_equivalent_nodes.pl       |  47 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  83 +--
 .../sectioning/two_nodes_between_chapters.pl       | 101 +---
 tp/t/results/sectioning/unknown_node_in_menu.pl    |  17 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |  43 +-
 tp/t/results/sectioning/unnumbered_before_top.pl   |   8 +-
 .../sectioning/unnumbered_before_top_node.pl       |  22 +-
 .../unnumbered_top_without_node_nodes.pl           |  74 +--
 .../unnumbered_top_without_node_sections.pl        |  86 +--
 tp/t/results/value/value_in_index_commands.pl      |   6 +-
 tp/t/results/value/value_in_misc_commands.pl       |  16 +-
 tp/t/results/value/value_in_node.pl                |  60 +-
 tp/t/results/value/value_node_directions.pl        |  42 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |  18 +-
 tp/t/results/xml_tests/comments_end_lines.pl       |   9 -
 .../xml_tests/comments_on_block_command_lines.pl   |   9 -
 tp/t/results/xml_tests/image_inline_or_not.pl      |  56 +-
 tp/t/results/xml_tests/node_and_bye.pl             |   6 +-
 tp/t/results/xml_tests/node_no_section.pl          |   6 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  16 +-
 .../results/xtable/inter_item_commands_in_table.pl |  29 +-
 tp/t/test_utils.pl                                 |   9 +-
 488 files changed, 5146 insertions(+), 14689 deletions(-)

diff --git a/tp/TODO b/tp/TODO
index f51ffcb589..bab3966c03 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -16,6 +16,8 @@ Before next release
 HTML.pm l 8024 check if setting MATHJAX_SCRIPT and MATHJAX_SOURCE is not
 set and HTML_MATH is mathjax shouldn't be done before.
 
+sections and nodes in split_by_section/node
+
 Bugs
 ====
 
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 962fc3857c..a7644ec0ba 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1006,8 +1006,7 @@ $result_nodes{'at_commands_in_raw'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -1015,8 +1014,7 @@ $result_menus{'at_commands_in_raw'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index cf0b2e9e24..c881a0e9a1 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1395,16 +1395,14 @@ explanation
 $result_nodes{'complex_nestings'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'complex_nestings'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index c2b035ab1b..13c0b73d2f 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -195,16 +195,14 @@ Para2.
 $result_nodes{'footnote_no_number'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'footnote_no_number'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 76d6efd0b3..fa5a259a50 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -195,16 +195,14 @@ Para2.
 $result_nodes{'footnote_no_number_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'footnote_no_number_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 263e451dae..7d7ec66ce8 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2524,16 +2524,14 @@ f--ile.
 $result_nodes{'image_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'image_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 0aff4c4ff7..0b855e6d9f 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -342,16 +342,14 @@ text2
 $result_nodes{'index_entry_in_preformatted'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'index_entry_in_preformatted'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 6830248f56..aa98ee777e 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -677,8 +677,7 @@ $result_nodes{'printindex_merged_indices_code_style'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -686,8 +685,7 @@ $result_menus{'printindex_merged_indices_code_style'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index a94b669215..bc02f3dad1 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2116,12 +2116,10 @@ $result_sectioning{'ref_in_sectioning'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -2132,12 +2130,10 @@ $result_sectioning{'ref_in_sectioning'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2153,12 +2149,10 @@ $result_sectioning{'ref_in_sectioning'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2166,9 +2160,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.1',
@@ -2177,9 +2169,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.2',
@@ -2189,9 +2179,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.3',
@@ -2201,9 +2189,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.4',
@@ -2213,9 +2199,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.5',
@@ -2225,9 +2209,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.6',
@@ -2237,9 +2219,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.7',
@@ -2249,9 +2229,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.8',
@@ -2261,9 +2239,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.9',
@@ -2273,9 +2249,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.10',
@@ -2285,9 +2259,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.11',
@@ -2297,9 +2269,7 @@ $result_sectioning{'ref_in_sectioning'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.12',
@@ -2358,9 +2328,7 @@ $result_nodes{'ref_in_sectioning'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -2368,20 +2336,10 @@ $result_nodes{'ref_in_sectioning'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2389,16 +2347,13 @@ $result_nodes{'ref_in_sectioning'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'node_next' => {
@@ -2406,16 +2361,13 @@ $result_nodes{'ref_in_sectioning'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'chap',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chap'
           },
           'structure' => {
             'node_prev' => {},
@@ -2438,22 +2390,19 @@ 
$result_nodes{'ref_in_sectioning'}{'structure'}{'node_next'} = $result_nodes{'re
 $result_menus{'ref_in_sectioning'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chap',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chap'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index c5dbb1b14e..f9332c8126 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4337,11 +4337,9 @@ $result_sectioning{'refs_formatting'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -4359,24 +4357,20 @@ $result_nodes{'refs_formatting'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1,
         'number' => 1
       }
     },
-    'normalized' => 'chapter',
-    'spaces_before_argument' => ' '
+    'normalized' => 'chapter'
   }
 };
 
 $result_menus{'refs_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'chapter',
-    'spaces_before_argument' => ' '
+    'normalized' => 'chapter'
   }
 };
 
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 c68b7dbf81..4d409ccec9 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
@@ -1699,12 +1699,10 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1715,12 +1713,10 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => '  '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1747,9 +1743,7 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1757,20 +1751,10 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1778,16 +1762,13 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => '  '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-        'spaces_before_argument' => ' '
+        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
       },
       'structure' => {
         'node_prev' => {},
@@ -1804,15 +1785,13 @@ 
$result_nodes{'some_at_commands_in_ref_nodes'}{'structure'}{'node_next'} = $resu
 $result_menus{'some_at_commands_in_ref_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-        'spaces_before_argument' => ' '
+        'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
       },
       'structure' => {
         'menu_up' => {},
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 76d357ce8c..e7079f5cab 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
@@ -817,28 +817,17 @@ $result_nodes{'spaces_in_empty_node_names'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'spaces_in_empty_node_names'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index f8e5bcf7cb..ec353a5946 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -909,41 +909,28 @@ $result_nodes{'spaces_in_node_names'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'a--',
-        'spaces_before_argument' => ' '
+        'normalized' => 'a--'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'b-',
-            'spaces_before_argument' => ' '
+            'normalized' => 'b-'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'c-',
-                'spaces_before_argument' => ' '
+                'normalized' => 'c-'
               },
               'structure' => {
                 'node_prev' => {},
@@ -972,29 +959,25 @@ 
$result_nodes{'spaces_in_node_names'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'spaces_in_node_names'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'a--',
-        'spaces_before_argument' => ' '
+        'normalized' => 'a--'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'b-',
-            'spaces_before_argument' => ' '
+            'normalized' => 'b-'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'c-',
-                'spaces_before_argument' => ' '
+                'normalized' => 'c-'
               },
               'structure' => {
                 'menu_prev' => {},
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index b0fbec50fc..dc6e255c3b 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3234,12 +3234,10 @@ $result_sectioning{'test_deftypefnnewline'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3250,12 +3248,10 @@ $result_sectioning{'test_deftypefnnewline'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3282,15 +3278,12 @@ $result_nodes{'test_deftypefnnewline'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -3298,16 +3291,13 @@ $result_nodes{'test_deftypefnnewline'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -3322,8 +3312,7 @@ 
$result_nodes{'test_deftypefnnewline'}{'structure'}{'node_next'}{'structure'}{'n
 $result_menus{'test_deftypefnnewline'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 87f8b169a2..2abd65fdca 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1359,11 +1359,9 @@ $result_sectioning{'things_before_setfilename'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1380,23 +1378,19 @@ $result_nodes{'things_before_setfilename'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'things_before_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -1427,16 +1421,7 @@ $result_floats{'things_before_setfilename'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float-anchor',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -1456,16 +1441,7 @@ $result_floats{'things_before_setfilename'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'ta',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
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 3baffdc1c8..fd44a33a5d 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
@@ -1284,16 +1284,7 @@ $result_floats{'things_before_setfilename_no_element'} = 
{
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float-anchor',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -1313,16 +1304,7 @@ $result_floats{'things_before_setfilename_no_element'} = 
{
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'ta',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index 424bc3fc59..a344044166 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4352,15 +4352,13 @@ $result_texts{'top_in_ref'} = '
 $result_nodes{'top_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'refs-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'refs-node'
       },
       'structure' => {
         'node_prev' => {}
@@ -4373,8 +4371,7 @@ 
$result_nodes{'top_in_ref'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
 $result_menus{'top_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/converters_tests/top_in_ref_keep_top.pl 
b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
index 1aa9e8908e..fbb9aba6b3 100644
--- a/tp/t/results/converters_tests/top_in_ref_keep_top.pl
+++ b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
@@ -4352,15 +4352,13 @@ $result_texts{'top_in_ref_keep_top'} = '
 $result_nodes{'top_in_ref_keep_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'refs-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'refs-node'
       },
       'structure' => {
         'node_prev' => {}
@@ -4373,8 +4371,7 @@ 
$result_nodes{'top_in_ref_keep_top'}{'structure'}{'node_next'}{'structure'}{'nod
 $result_menus{'top_in_ref_keep_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 0cfb6d6bfa..f27ba730d0 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -424,16 +424,7 @@ $result_floats{'block_commands'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'b-float',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 392da6657f..36f167cf32 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1041,11 +1041,9 @@ $result_sectioning{'punctuation_in_line_commands'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'node_0021-After-punc',
-              'spaces_before_argument' => ' '
+              'normalized' => 'node_0021-After-punc'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1062,16 +1060,13 @@ $result_nodes{'punctuation_in_line_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'node_0021-After-punc',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node_0021-After-punc'
   }
 };
 
@@ -1079,8 +1074,7 @@ $result_menus{'punctuation_in_line_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'node_0021-After-punc',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node_0021-After-punc'
   }
 };
 
@@ -1092,19 +1086,9 @@ $result_floats{'punctuation_in_line_commands'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 0
           }
@@ -1116,7 +1100,6 @@ $result_floats{'punctuation_in_line_commands'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -1139,17 +1122,8 @@ $result_floats{'punctuation_in_line_commands'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'label-with-caption',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index 8163af8873..cd29fd898a 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -255,15 +255,6 @@ $result_floats{'caption_not_closed'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 568deb70dd..5313e360c1 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -125,9 +125,7 @@ $result_sectioning{'footnote_no_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index 5d7047aafe..0c3b027a20 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -160,16 +160,14 @@ chapter
 $result_nodes{'inforef_too_much_args'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'chapter',
-    'spaces_before_argument' => ' '
+    'normalized' => 'chapter'
   }
 };
 
 $result_menus{'inforef_too_much_args'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'chapter',
-    'spaces_before_argument' => ' '
+    'normalized' => 'chapter'
   }
 };
 
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 1601e59e34..1c9822911f 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3622,16 +3622,14 @@ In text f@i--le..  a@<"%@  < & @ % " .
 $result_nodes{'test_image'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'test_image'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3875,16 +3873,7 @@ $result_floats{'test_image'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'Image-with-commands',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
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 8ab7fca559..43c412fda3 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -688,12 +688,10 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -704,12 +702,10 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -736,9 +732,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -746,20 +740,10 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -767,16 +751,13 @@ $result_nodes{'two_footnotes_in_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -793,15 +774,13 @@ 
$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'node_next'} = $result_node
 $result_menus{'two_footnotes_in_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
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 5150df1c11..034a8a430e 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
@@ -724,12 +724,10 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -740,12 +738,10 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -772,9 +768,7 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -782,20 +776,10 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -803,16 +787,13 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -829,15 +810,13 @@ 
$result_nodes{'two_footnotes_in_nodes_separate'}{'structure'}{'node_next'} = $re
 $result_menus{'two_footnotes_in_nodes_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 71998c807f..f51448063f 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -196,16 +196,14 @@ Top.
 $result_nodes{'verb_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'verb_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 399402f3e9..51889ae154 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -15774,8 +15774,7 @@ $result_nodes{'all_commands_delimiters_printindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -15783,8 +15782,7 @@ $result_menus{'all_commands_delimiters_printindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index ccad5df15a..2295c65a49 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -5672,8 +5672,7 @@ $result_nodes{'all_commands_printindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -5681,8 +5680,7 @@ $result_menus{'all_commands_printindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index ed6e7e10ae..d33c6b633e 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -808,16 +808,14 @@ T
 $result_nodes{'ref_in_def'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'ref_in_def'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 d9e1db662f..f1ef418bdc 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -470,8 +470,7 @@ $result_nodes{'space_in_def_for_index'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -479,8 +478,7 @@ $result_menus{'space_in_def_for_index'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index 9a7ca73638..f4df6b8b2e 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -634,12 +634,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -650,12 +648,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -671,12 +667,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-fr',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-fr'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -688,12 +682,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'subnode-pt',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'subnode-pt'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -707,12 +699,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'subnode-fr',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'subnode-fr'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -752,15 +742,12 @@ $result_nodes{'multiple_documentlanguage'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -768,16 +755,13 @@ $result_nodes{'multiple_documentlanguage'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_next' => {
@@ -785,16 +769,13 @@ $result_nodes{'multiple_documentlanguage'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'chapter-fr',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-fr'
           },
           'structure' => {
             'node_prev' => {},
@@ -815,8 +796,7 @@ 
$result_nodes{'multiple_documentlanguage'}{'structure'}{'node_next'}{'structure'
 $result_menus{'multiple_documentlanguage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 5157b0a390..1606cb1403 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -950,12 +950,10 @@ $result_sectioning{'special_docbook_unnumbered'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -966,12 +964,10 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Dedication',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Dedication'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -986,12 +982,10 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'preface',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'preface'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1007,12 +1001,10 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'colophon',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'colophon'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1028,12 +1020,10 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'acknowledgements',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'acknowledgements'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1073,9 +1063,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1083,20 +1071,10 @@ $result_nodes{'special_docbook_unnumbered'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1104,15 +1082,12 @@ $result_nodes{'special_docbook_unnumbered'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1
           }
         },
-        'normalized' => 'Dedication',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Dedication'
       },
       'structure' => {
         'node_next' => {
@@ -1120,15 +1095,12 @@ $result_nodes{'special_docbook_unnumbered'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1
               }
             },
-            'normalized' => 'preface',
-            'spaces_before_argument' => ' '
+            'normalized' => 'preface'
           },
           'structure' => {
             'node_next' => {
@@ -1136,15 +1108,12 @@ $result_nodes{'special_docbook_unnumbered'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'unnumbered',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1
                   }
                 },
-                'normalized' => 'colophon',
-                'spaces_before_argument' => ' '
+                'normalized' => 'colophon'
               },
               'structure' => {
                 'node_next' => {
@@ -1152,16 +1121,13 @@ $result_nodes{'special_docbook_unnumbered'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 1
                       }
                     },
-                    'normalized' => 'acknowledgements',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'acknowledgements'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -1196,36 +1162,31 @@ 
$result_nodes{'special_docbook_unnumbered'}{'structure'}{'node_next'} = $result_
 $result_menus{'special_docbook_unnumbered'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Dedication',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Dedication'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'preface',
-            'spaces_before_argument' => ' '
+            'normalized' => 'preface'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'colophon',
-                'spaces_before_argument' => ' '
+                'normalized' => 'colophon'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'acknowledgements',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'acknowledgements'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index 9000ee7c4a..8023cab138 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -319,16 +319,14 @@ In float.
 $result_nodes{'anchor_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -346,16 +344,7 @@ $result_floats{'anchor_in_caption'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 7c715679f2..8bdb55dc02 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -393,8 +393,7 @@ $result_nodes{'cindex_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -402,8 +401,7 @@ $result_menus{'cindex_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -422,16 +420,7 @@ $result_floats{'cindex_in_caption'} = {
           },
           'structure' => {}
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
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 3e3584935b..96450ee167 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -298,16 +298,14 @@ Float
 $result_nodes{'comment_space_comand_in_float'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'comment_space_comand_in_float'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -319,16 +317,7 @@ $result_floats{'comment_space_comand_in_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label--',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 64e9b0331e..28f54f6494 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4567,12 +4567,10 @@ $result_sectioning{'complex_float'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -4583,12 +4581,10 @@ $result_sectioning{'complex_float'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4615,9 +4611,7 @@ $result_nodes{'complex_float'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -4625,20 +4619,10 @@ $result_nodes{'complex_float'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -4646,16 +4630,13 @@ $result_nodes{'complex_float'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -4672,15 +4653,13 @@ 
$result_nodes{'complex_float'}{'structure'}{'node_next'} = $result_nodes{'comple
 $result_menus{'complex_float'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
@@ -4704,23 +4683,12 @@ $result_floats{'complex_float'} = {
         'caption' => {
           'cmdname' => 'caption',
           'extra' => {
-            'float' => {},
-            'spaces_before_argument' => ' '
-          }
-        },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
+            'float' => {}
           }
         },
         'float_section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 0
           }
@@ -4732,7 +4700,6 @@ $result_floats{'complex_float'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -4752,30 +4719,18 @@ $result_floats{'complex_float'} = {
         'caption' => {
           'cmdname' => 'caption',
           'extra' => {
-            'float' => {},
-            'spaces_before_argument' => ' '
-          }
-        },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
+            'float' => {}
           }
         },
         'float_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 41727ab3d9..9aff28eee6 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -558,16 +558,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label1',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -585,16 +576,7 @@ $result_floats{'empty_listoffloats_with_floats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label2',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -606,14 +588,6 @@ $result_floats{'empty_listoffloats_with_floats'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'type' => {
           'normalized' => ''
         }
@@ -629,14 +603,6 @@ $result_floats{'empty_listoffloats_with_floats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'type' => {
           'normalized' => ''
         }
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 489d806f8c..45385baceb 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1228,12 +1228,10 @@ $result_sectioning{'float_copying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1245,12 +1243,10 @@ $result_sectioning{'float_copying'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'Copying-and-floats',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Copying-and-floats'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1277,9 +1273,7 @@ $result_nodes{'float_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1287,20 +1281,10 @@ $result_nodes{'float_copying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1308,17 +1292,14 @@ $result_nodes{'float_copying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'appendix',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 'A'
           }
         },
         'isindex' => 1,
-        'normalized' => 'Copying-and-floats',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Copying-and-floats'
       },
       'structure' => {
         'node_prev' => {},
@@ -1335,16 +1316,14 @@ 
$result_nodes{'float_copying'}{'structure'}{'node_next'} = $result_nodes{'float_
 $result_menus{'float_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'Copying-and-floats',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Copying-and-floats'
       },
       'structure' => {
         'menu_up' => {},
@@ -1372,16 +1351,7 @@ $result_floats{'float_copying'} = {
           },
           'structure' => {}
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'public-domain',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index 85a79f2aa0..f85adaee8c 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -525,16 +525,7 @@ $result_floats{'float_with_at_commands'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'premi_00e8re-entr_00e9e',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 5dc27f41e8..5762a627d2 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -319,16 +319,14 @@ In float.
 $result_nodes{'footnote_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'footnote_in_caption'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -346,16 +344,7 @@ $result_floats{'footnote_in_caption'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
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 44504aa332..dc7e09a138 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -330,16 +330,14 @@ In float.
 $result_nodes{'footnote_in_caption_and_error'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'footnote_in_caption_and_error'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -367,16 +365,7 @@ $result_floats{'footnote_in_caption_and_error'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index c21610ce71..e3ca083b6c 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -6717,12 +6717,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -6733,12 +6731,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6750,12 +6746,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6775,12 +6769,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Unnumbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Unnumbered'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6791,12 +6783,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'Section-within-unnumbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'Section-within-unnumbered'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6816,12 +6806,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Chapter-with-unnumbsubsec',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chapter-with-unnumbsubsec'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6833,12 +6821,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumbered-sec',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumbered-sec'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6858,12 +6844,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Appendix-for-float',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Appendix-for-float'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6880,12 +6864,10 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'list-of-floats',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'list-of-floats'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6931,9 +6913,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -6941,20 +6921,10 @@ $result_nodes{'numbering_captions_listoffloats'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -6962,9 +6932,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -6973,20 +6941,10 @@ $result_nodes{'numbering_captions_listoffloats'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -6994,16 +6952,13 @@ $result_nodes{'numbering_captions_listoffloats'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
               }
             },
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'node_up' => {}
@@ -7014,9 +6969,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1
               }
@@ -7024,20 +6977,10 @@ $result_nodes{'numbering_captions_listoffloats'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'Unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Unnumbered'
           },
           'structure' => {
             'menu_child' => {
@@ -7045,15 +6988,12 @@ $result_nodes{'numbering_captions_listoffloats'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2
                   }
                 },
-                'normalized' => 'Section-within-unnumbered',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Section-within-unnumbered'
               },
               'structure' => {
                 'node_up' => {}
@@ -7064,9 +7004,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 2
@@ -7075,20 +7013,10 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'Chapter-with-unnumbsubsec',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Chapter-with-unnumbsubsec'
               },
               'structure' => {
                 'menu_child' => {
@@ -7096,15 +7024,12 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2
                       }
                     },
-                    'normalized' => 'unnumbered-sec',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumbered-sec'
                   },
                   'structure' => {
                     'node_up' => {}
@@ -7115,16 +7040,13 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'appendix',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 'A'
                       }
                     },
-                    'normalized' => 'Appendix-for-float',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Appendix-for-float'
                   },
                   'structure' => {
                     'node_next' => {
@@ -7132,15 +7054,12 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumbered',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1
                           }
                         },
-                        'normalized' => 'list-of-floats',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'list-of-floats'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -7184,22 +7103,19 @@ 
$result_nodes{'numbering_captions_listoffloats'}{'structure'}{'node_next'} = $re
 $result_menus{'numbering_captions_listoffloats'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_up' => {},
@@ -7211,15 +7127,13 @@ $result_menus{'numbering_captions_listoffloats'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Unnumbered'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Section-within-unnumbered',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Section-within-unnumbered'
               },
               'structure' => {
                 'menu_up' => {},
@@ -7231,15 +7145,13 @@ $result_menus{'numbering_captions_listoffloats'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Chapter-with-unnumbsubsec',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Chapter-with-unnumbsubsec'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumbered-sec',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumbered-sec'
                   },
                   'structure' => {
                     'menu_up' => {},
@@ -7251,15 +7163,13 @@ $result_menus{'numbering_captions_listoffloats'} = {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Appendix-for-float',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Appendix-for-float'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'list-of-floats',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'list-of-floats'
                       },
                       'structure' => {
                         'menu_prev' => {},
@@ -7325,19 +7235,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 0
           }
@@ -7349,7 +7249,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -7361,17 +7260,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'label-but-no-type-and-no-caption',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -7383,14 +7273,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'type' => {
           'normalized' => ''
@@ -7407,14 +7289,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'shortcaption' => {
           'cmdname' => 'shortcaption',
@@ -7437,14 +7311,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'label-but-no-type-2',
         'shortcaption' => {
@@ -7453,7 +7319,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -7471,19 +7336,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -7496,7 +7351,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -7514,19 +7368,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1
           }
@@ -7538,7 +7382,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -7556,19 +7399,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'unnumberedsec',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2
           }
@@ -7580,7 +7413,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -7597,16 +7429,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'caption' => {
           'cmdname' => 'caption',
           'extra' => {
-            'float' => {},
-            'spaces_before_argument' => ' '
-          }
-        },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
+            'float' => {}
           }
         },
         'float_section' => {},
@@ -7617,7 +7440,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7640,14 +7462,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'shortcaption' => {
           'cmdname' => 'shortcaption',
@@ -7655,7 +7469,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7676,17 +7489,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'text-in-chapter',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7706,21 +7510,11 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'caption' => {
           'cmdname' => 'caption',
           'extra' => {
-            'float' => {},
-            'spaces_before_argument' => ' '
-          }
-        },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
+            'float' => {}
           }
         },
         'float_section' => {},
         'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7737,26 +7531,15 @@ $result_floats{'numbering_captions_listoffloats'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'section',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2,
             'number' => '1.1'
           }
         },
         'normalized' => 'text-in-section',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7779,14 +7562,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'unnumbered-float',
         'shortcaption' => {
@@ -7795,7 +7570,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7818,19 +7592,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'section',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2
           }
@@ -7842,7 +7606,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7865,19 +7628,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 2
@@ -7890,7 +7643,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7913,14 +7665,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'unnumbered-sec-float',
         'shortcaption' => {
@@ -7929,7 +7673,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -7952,19 +7695,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'appendix',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 'A'
@@ -7977,7 +7710,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -8002,14 +7734,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'warning-in-top',
         'shortcaption' => {
@@ -8018,7 +7742,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -8041,14 +7764,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'warning-in-chapter',
         'shortcaption' => {
@@ -8057,7 +7772,6 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -8082,17 +7796,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'theoreme',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 57abb150d5..75aa255265 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -372,16 +372,7 @@ $result_floats{'ref_to_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'Label2',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -395,16 +386,7 @@ $result_floats{'ref_to_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'Label1',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 9859e32b24..9a7425fa58 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -198,16 +198,7 @@ $result_floats{'simple'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'Label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 1a547c7fd0..9389858509 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -3128,11 +3128,9 @@ $result_sectioning{'accent'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top-node'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3149,23 +3147,19 @@ $result_nodes{'accent'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
 $result_menus{'accent'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index e8dcbcf8b9..8711313d48 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -3128,11 +3128,9 @@ $result_sectioning{'accent_enable_encoding'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top-node'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3149,23 +3147,19 @@ $result_nodes{'accent_enable_encoding'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
 $result_menus{'accent_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 4de9d7f12f..00e2e0c4c0 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3173,11 +3173,9 @@ $result_sectioning{'accentenc'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top-node'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3194,23 +3192,19 @@ $result_nodes{'accentenc'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
 $result_menus{'accentenc'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 3a38a30862..cf6f4bf7af 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -3173,11 +3173,9 @@ $result_sectioning{'accentenc_enable_encoding'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top-node'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3194,23 +3192,19 @@ $result_nodes{'accentenc_enable_encoding'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
 $result_menus{'accentenc_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top-node'
   }
 };
 
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 f2142ee0aa..22b2ddf34c 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -21030,12 +21030,10 @@ $result_sectioning{'at_commands_in_refs'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -21046,12 +21044,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '-_007b-_007d',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '-_007b-_007d'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21067,12 +21063,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21089,12 +21083,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21111,12 +21103,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21133,12 +21123,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21155,12 +21143,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_2265-_2264-_2192',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_2265-_2264-_2192'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21177,12 +21163,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21199,12 +21183,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21221,12 +21203,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21243,12 +21223,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => '  '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21265,12 +21243,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21287,12 +21263,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0131-_1e14-_1e08',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0131-_1e14-_1e08'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21309,12 +21283,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21331,12 +21303,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21353,12 +21323,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21375,12 +21343,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'AAA-AAA-BBB',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'AAA-AAA-BBB'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21397,12 +21363,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'CCC-CCC-DDD',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'CCC-CCC-DDD'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21419,12 +21383,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21441,12 +21403,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21463,12 +21423,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '-_0040-_007b_007d-_002e-',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '-_0040-_007b_007d-_002e-'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21485,12 +21443,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21507,12 +21463,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21529,12 +21483,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '8_002e27in',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '8_002e27in'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21551,12 +21503,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'sansserif-slanted',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sansserif-slanted'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21573,12 +21523,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'indicateurl',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'indicateurl'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21595,12 +21543,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'gH-3rd',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'gH-3rd'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21617,12 +21563,10 @@ $result_sectioning{'at_commands_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21754,9 +21698,7 @@ $result_nodes{'at_commands_in_refs'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -21764,20 +21706,10 @@ $result_nodes{'at_commands_in_refs'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -21785,16 +21717,13 @@ $result_nodes{'at_commands_in_refs'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => '-_007b-_007d',
-        'spaces_before_argument' => ' '
+        'normalized' => '-_007b-_007d'
       },
       'structure' => {
         'node_next' => {
@@ -21802,16 +21731,13 @@ $result_nodes{'at_commands_in_refs'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-            'spaces_before_argument' => ' '
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
           },
           'structure' => {
             'node_next' => {
@@ -21819,16 +21745,13 @@ $result_nodes{'at_commands_in_refs'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                'spaces_before_argument' => ' '
+                'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
               'structure' => {
                 'node_next' => {
@@ -21836,16 +21759,13 @@ $result_nodes{'at_commands_in_refs'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {
                     'node_next' => {
@@ -21853,16 +21773,13 @@ $result_nodes{'at_commands_in_refs'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
                       'structure' => {
                         'node_next' => {
@@ -21870,16 +21787,13 @@ $result_nodes{'at_commands_in_refs'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'chapter',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 1,
                                 'number' => 6
                               }
                             },
-                            'normalized' => '_2265-_2264-_2192',
-                            'spaces_before_argument' => ' '
+                            'normalized' => '_2265-_2264-_2192'
                           },
                           'structure' => {
                             'node_next' => {
@@ -21887,16 +21801,13 @@ $result_nodes{'at_commands_in_refs'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'chapter',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 1,
                                     'number' => 7
                                   }
                                 },
-                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -21904,16 +21815,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'chapter',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 1,
                                         'number' => 8
                                       }
                                     },
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -21921,16 +21829,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'chapter',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 1,
                                             'number' => 9
                                           }
                                         },
-                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
                                       'structure' => {
                                         'node_next' => {
@@ -21938,16 +21843,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
-                                              'extra' => {
-                                                'spaces_before_argument' => '  
'
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 1,
                                                 'number' => 10
                                               }
                                             },
-                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
                                           'structure' => {
                                             'node_next' => {
@@ -21955,16 +21857,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                               'extra' => {
                                                 'associated_section' => {
                                                   'cmdname' => 'chapter',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'level' => 1,
                                                     'number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                                               },
                                               'structure' => {
                                                 'node_next' => {
@@ -21972,16 +21871,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                   'extra' => {
                                                     'associated_section' => {
                                                       'cmdname' => 'chapter',
-                                                      'extra' => {
-                                                        
'spaces_before_argument' => ' '
-                                                      },
+                                                      'extra' => {},
                                                       'structure' => {
                                                         'level' => 1,
                                                         'number' => 12
                                                       }
                                                     },
-                                                    'normalized' => 
'_0131-_1e14-_1e08',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
                                                   'structure' => {
                                                     'node_next' => {
@@ -21989,16 +21885,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                       'extra' => {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'chapter',
-                                                          'extra' => {
-                                                            
'spaces_before_argument' => ' '
-                                                          },
+                                                          'extra' => {},
                                                           'structure' => {
                                                             'level' => 1,
                                                             'number' => 13
                                                           }
                                                         },
-                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
                                                       'structure' => {
                                                         'node_next' => {
@@ -22006,16 +21899,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                           'extra' => {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'chapter',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 'level' => 1,
                                                                 'number' => 14
                                                               }
                                                             },
-                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
                                                           'structure' => {
                                                             'node_next' => {
@@ -22023,16 +21913,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                               'extra' => {
                                                                 
'associated_section' => {
                                                                   'cmdname' => 
'chapter',
-                                                                  'extra' => {
-                                                                    
'spaces_before_argument' => ' '
-                                                                  },
+                                                                  'extra' => 
{},
                                                                   'structure' 
=> {
                                                                     'level' => 
1,
                                                                     'number' 
=> 15
                                                                   }
                                                                 },
-                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
                                                               'structure' => {
                                                                 'node_next' => 
{
@@ -22040,16 +21927,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                   'extra' => {
                                                                     
'associated_section' => {
                                                                       
'cmdname' => 'chapter',
-                                                                      'extra' 
=> {
-                                                                        
'spaces_before_argument' => ' '
-                                                                      },
+                                                                      'extra' 
=> {},
                                                                       
'structure' => {
                                                                         
'level' => 1,
                                                                         
'number' => 16
                                                                       }
                                                                     },
-                                                                    
'normalized' => 'AAA-AAA-BBB',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'AAA-AAA-BBB'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'node_next' => {
@@ -22057,16 +21941,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                       'extra' 
=> {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'chapter',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'level' => 1,
                                                                             
'number' => 17
                                                                           }
                                                                         },
-                                                                        
'normalized' => 'CCC-CCC-DDD',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'CCC-CCC-DDD'
                                                                       },
                                                                       
'structure' => {
                                                                         
'node_next' => {
@@ -22074,16 +21955,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                           
'extra' => {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'chapter',
-                                                                              
'extra' => {
-                                                                               
 'spaces_before_argument' => ' '
-                                                                              
},
+                                                                              
'extra' => {},
                                                                               
'structure' => {
                                                                                
 'level' => 1,
                                                                                
 'number' => 18
                                                                               }
                                                                             },
-                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
                                                                           
'structure' => {
                                                                             
'node_next' => {
@@ -22091,16 +21969,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                               
'extra' => {
                                                                                
 'associated_section' => {
                                                                                
   'cmdname' => 'chapter',
-                                                                               
   'extra' => {
-                                                                               
     'spaces_before_argument' => ' '
-                                                                               
   },
+                                                                               
   'extra' => {},
                                                                                
   'structure' => {
                                                                                
     'level' => 1,
                                                                                
     'number' => 19
                                                                                
   }
                                                                                
 },
-                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'node_next' => {
@@ -22108,16 +21983,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
   'extra' => {
                                                                                
     'associated_section' => {
                                                                                
       'cmdname' => 'chapter',
-                                                                               
       'extra' => {
-                                                                               
         'spaces_before_argument' => ' '
-                                                                               
       },
+                                                                               
       'extra' => {},
                                                                                
       'structure' => {
                                                                                
         'level' => 1,
                                                                                
         'number' => 20
                                                                                
       }
                                                                                
     },
-                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'node_next' => {
@@ -22125,16 +21997,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
       'extra' => {
                                                                                
         'associated_section' => {
                                                                                
           'cmdname' => 'chapter',
-                                                                               
           'extra' => {
-                                                                               
             'spaces_before_argument' => ' '
-                                                                               
           },
+                                                                               
           'extra' => {},
                                                                                
           'structure' => {
                                                                                
             'level' => 1,
                                                                                
             'number' => 21
                                                                                
           }
                                                                                
         },
-                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'node_next' => {
@@ -22142,16 +22011,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
           'extra' => {
                                                                                
             'associated_section' => {
                                                                                
               'cmdname' => 'chapter',
-                                                                               
               'extra' => {
-                                                                               
                 'spaces_before_argument' => ' '
-                                                                               
               },
+                                                                               
               'extra' => {},
                                                                                
               'structure' => {
                                                                                
                 'level' => 1,
                                                                                
                 'number' => 22
                                                                                
               }
                                                                                
             },
-                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
-                                                                               
             'spaces_before_argument' => ' '
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
                                                                                
           'structure' => {
                                                                                
             'node_next' => {
@@ -22159,16 +22025,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
               'extra' => {
                                                                                
                 'associated_section' => {
                                                                                
                   'cmdname' => 'chapter',
-                                                                               
                   'extra' => {
-                                                                               
                     'spaces_before_argument' => ' '
-                                                                               
                   },
+                                                                               
                   'extra' => {},
                                                                                
                   'structure' => {
                                                                                
                     'level' => 1,
                                                                                
                     'number' => 23
                                                                                
                   }
                                                                                
                 },
-                                                                               
                 'normalized' => '8_002e27in',
-                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
                 'normalized' => '8_002e27in'
                                                                                
               },
                                                                                
               'structure' => {
                                                                                
                 'node_next' => {
@@ -22176,16 +22039,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                   'extra' => {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'chapter',
-                                                                               
                       'extra' => {
-                                                                               
                         'spaces_before_argument' => ' '
-                                                                               
                       },
+                                                                               
                       'extra' => {},
                                                                                
                       'structure' => {
                                                                                
                         'level' => 1,
                                                                                
                         'number' => 24
                                                                                
                       }
                                                                                
                     },
-                                                                               
                     'normalized' => 'sansserif-slanted',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'node_next' => {
@@ -22193,16 +22053,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                       'extra' => {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'chapter',
-                                                                               
                           'extra' => {
-                                                                               
                             'spaces_before_argument' => ' '
-                                                                               
                           },
+                                                                               
                           'extra' => {},
                                                                                
                           'structure' => {
                                                                                
                             'level' => 1,
                                                                                
                             'number' => 25
                                                                                
                           }
                                                                                
                         },
-                                                                               
                         'normalized' => 'indicateurl',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'indicateurl'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'node_next' => {
@@ -22210,16 +22067,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                           'extra' => {
                                                                                
                             'associated_section' => {
                                                                                
                               'cmdname' => 'chapter',
-                                                                               
                               'extra' => {
-                                                                               
                                 'spaces_before_argument' => ' '
-                                                                               
                               },
+                                                                               
                               'extra' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'level' => 1,
                                                                                
                                 'number' => 26
                                                                                
                               }
                                                                                
                             },
-                                                                               
                             'normalized' => 'gH-3rd',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'gH-3rd'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'node_next' => {
@@ -22227,16 +22081,13 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                               'extra' => {
                                                                                
                                 'associated_section' => {
                                                                                
                                   'cmdname' => 'chapter',
-                                                                               
                                   'extra' => {
-                                                                               
                                     'spaces_before_argument' => ' '
-                                                                               
                                   },
+                                                                               
                                   'extra' => {},
                                                                                
                                   'structure' => {
                                                                                
                                     'level' => 1,
                                                                                
                                     'number' => 27
                                                                                
                                   }
                                                                                
                                 },
-                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'node_prev' => {},
@@ -22409,197 +22260,169 @@ 
$result_nodes{'at_commands_in_refs'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'at_commands_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '-_007b-_007d',
-        'spaces_before_argument' => ' '
+        'normalized' => '-_007b-_007d'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-            'spaces_before_argument' => ' '
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                'spaces_before_argument' => ' '
+                'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => '_2265-_2264-_2192',
-                            'spaces_before_argument' => ' '
+                            'normalized' => '_2265-_2264-_2192'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
                                           'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                                               },
                                               'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'_0131-_1e14-_1e08',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
                                                   'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
-                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
                                                       'structure' => {
                                                         'menu_next' => {
                                                           'cmdname' => 'node',
                                                           'extra' => {
-                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
                                                           'structure' => {
                                                             'menu_next' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
                                                               'structure' => {
                                                                 'menu_next' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
-                                                                    
'normalized' => 'AAA-AAA-BBB',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'AAA-AAA-BBB'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'menu_next' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
-                                                                        
'normalized' => 'CCC-CCC-DDD',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'CCC-CCC-DDD'
                                                                       },
                                                                       
'structure' => {
                                                                         
'menu_next' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
-                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
                                                                           
'structure' => {
                                                                             
'menu_next' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
-                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'menu_next' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
-                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'menu_next' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
-                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'menu_next' => {
                                                                                
           'cmdname' => 'node',
                                                                                
           'extra' => {
-                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
-                                                                               
             'spaces_before_argument' => ' '
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
                                                                                
           'structure' => {
                                                                                
             'menu_next' => {
                                                                                
               'cmdname' => 'node',
                                                                                
               'extra' => {
-                                                                               
                 'normalized' => '8_002e27in',
-                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
                 'normalized' => '8_002e27in'
                                                                                
               },
                                                                                
               'structure' => {
                                                                                
                 'menu_next' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
-                                                                               
                     'normalized' => 'sansserif-slanted',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'menu_next' => {
                                                                                
                       'cmdname' => 'node',
                                                                                
                       'extra' => {
-                                                                               
                         'normalized' => 'indicateurl',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'indicateurl'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'menu_next' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
-                                                                               
                             'normalized' => 'gH-3rd',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'gH-3rd'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'menu_next' => {
                                                                                
                               'cmdname' => 'node',
                                                                                
                               'extra' => {
-                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'menu_prev' => {},
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 83488da58c..18b0d83742 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
@@ -21108,12 +21108,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -21124,12 +21122,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '-_007b-_007d',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '-_007b-_007d'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21145,12 +21141,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21167,12 +21161,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21189,12 +21181,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21211,12 +21201,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21233,12 +21221,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_2265-_2264-_2192',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_2265-_2264-_2192'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21255,12 +21241,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21277,12 +21261,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21299,12 +21281,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21321,12 +21301,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => '  '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21343,12 +21321,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21365,12 +21341,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0131-_1e14-_1e08',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0131-_1e14-_1e08'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21387,12 +21361,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21409,12 +21381,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21431,12 +21401,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21453,12 +21421,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'AAA-AAA-BBB',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'AAA-AAA-BBB'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21475,12 +21441,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'CCC-CCC-DDD',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'CCC-CCC-DDD'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21497,12 +21461,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21519,12 +21481,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21541,12 +21501,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '-_0040-_007b_007d-_002e-',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '-_0040-_007b_007d-_002e-'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21563,12 +21521,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21585,12 +21541,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21607,12 +21561,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '8_002e27in',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '8_002e27in'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21629,12 +21581,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'sansserif-slanted',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sansserif-slanted'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21651,12 +21601,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'indicateurl',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'indicateurl'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21673,12 +21621,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'gH-3rd',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'gH-3rd'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21695,12 +21641,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21832,9 +21776,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -21842,20 +21784,10 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -21863,16 +21795,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => '-_007b-_007d',
-        'spaces_before_argument' => ' '
+        'normalized' => '-_007b-_007d'
       },
       'structure' => {
         'node_next' => {
@@ -21880,16 +21809,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-            'spaces_before_argument' => ' '
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
           },
           'structure' => {
             'node_next' => {
@@ -21897,16 +21823,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                'spaces_before_argument' => ' '
+                'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
               'structure' => {
                 'node_next' => {
@@ -21914,16 +21837,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {
                     'node_next' => {
@@ -21931,16 +21851,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
                       'structure' => {
                         'node_next' => {
@@ -21948,16 +21865,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'chapter',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 1,
                                 'number' => 6
                               }
                             },
-                            'normalized' => '_2265-_2264-_2192',
-                            'spaces_before_argument' => ' '
+                            'normalized' => '_2265-_2264-_2192'
                           },
                           'structure' => {
                             'node_next' => {
@@ -21965,16 +21879,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'chapter',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 1,
                                     'number' => 7
                                   }
                                 },
-                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -21982,16 +21893,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'chapter',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 1,
                                         'number' => 8
                                       }
                                     },
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -21999,16 +21907,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'chapter',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 1,
                                             'number' => 9
                                           }
                                         },
-                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
                                       'structure' => {
                                         'node_next' => {
@@ -22016,16 +21921,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
-                                              'extra' => {
-                                                'spaces_before_argument' => '  
'
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 1,
                                                 'number' => 10
                                               }
                                             },
-                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
                                           'structure' => {
                                             'node_next' => {
@@ -22033,16 +21935,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                               'extra' => {
                                                 'associated_section' => {
                                                   'cmdname' => 'chapter',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'level' => 1,
                                                     'number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                                               },
                                               'structure' => {
                                                 'node_next' => {
@@ -22050,16 +21949,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                   'extra' => {
                                                     'associated_section' => {
                                                       'cmdname' => 'chapter',
-                                                      'extra' => {
-                                                        
'spaces_before_argument' => ' '
-                                                      },
+                                                      'extra' => {},
                                                       'structure' => {
                                                         'level' => 1,
                                                         'number' => 12
                                                       }
                                                     },
-                                                    'normalized' => 
'_0131-_1e14-_1e08',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
                                                   'structure' => {
                                                     'node_next' => {
@@ -22067,16 +21963,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                       'extra' => {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'chapter',
-                                                          'extra' => {
-                                                            
'spaces_before_argument' => ' '
-                                                          },
+                                                          'extra' => {},
                                                           'structure' => {
                                                             'level' => 1,
                                                             'number' => 13
                                                           }
                                                         },
-                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
                                                       'structure' => {
                                                         'node_next' => {
@@ -22084,16 +21977,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                           'extra' => {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'chapter',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 'level' => 1,
                                                                 'number' => 14
                                                               }
                                                             },
-                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
                                                           'structure' => {
                                                             'node_next' => {
@@ -22101,16 +21991,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                               'extra' => {
                                                                 
'associated_section' => {
                                                                   'cmdname' => 
'chapter',
-                                                                  'extra' => {
-                                                                    
'spaces_before_argument' => ' '
-                                                                  },
+                                                                  'extra' => 
{},
                                                                   'structure' 
=> {
                                                                     'level' => 
1,
                                                                     'number' 
=> 15
                                                                   }
                                                                 },
-                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
                                                               'structure' => {
                                                                 'node_next' => 
{
@@ -22118,16 +22005,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                   'extra' => {
                                                                     
'associated_section' => {
                                                                       
'cmdname' => 'chapter',
-                                                                      'extra' 
=> {
-                                                                        
'spaces_before_argument' => ' '
-                                                                      },
+                                                                      'extra' 
=> {},
                                                                       
'structure' => {
                                                                         
'level' => 1,
                                                                         
'number' => 16
                                                                       }
                                                                     },
-                                                                    
'normalized' => 'AAA-AAA-BBB',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'AAA-AAA-BBB'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'node_next' => {
@@ -22135,16 +22019,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                       'extra' 
=> {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'chapter',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'level' => 1,
                                                                             
'number' => 17
                                                                           }
                                                                         },
-                                                                        
'normalized' => 'CCC-CCC-DDD',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'CCC-CCC-DDD'
                                                                       },
                                                                       
'structure' => {
                                                                         
'node_next' => {
@@ -22152,16 +22033,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                           
'extra' => {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'chapter',
-                                                                              
'extra' => {
-                                                                               
 'spaces_before_argument' => ' '
-                                                                              
},
+                                                                              
'extra' => {},
                                                                               
'structure' => {
                                                                                
 'level' => 1,
                                                                                
 'number' => 18
                                                                               }
                                                                             },
-                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
                                                                           
'structure' => {
                                                                             
'node_next' => {
@@ -22169,16 +22047,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                               
'extra' => {
                                                                                
 'associated_section' => {
                                                                                
   'cmdname' => 'chapter',
-                                                                               
   'extra' => {
-                                                                               
     'spaces_before_argument' => ' '
-                                                                               
   },
+                                                                               
   'extra' => {},
                                                                                
   'structure' => {
                                                                                
     'level' => 1,
                                                                                
     'number' => 19
                                                                                
   }
                                                                                
 },
-                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'node_next' => {
@@ -22186,16 +22061,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
   'extra' => {
                                                                                
     'associated_section' => {
                                                                                
       'cmdname' => 'chapter',
-                                                                               
       'extra' => {
-                                                                               
         'spaces_before_argument' => ' '
-                                                                               
       },
+                                                                               
       'extra' => {},
                                                                                
       'structure' => {
                                                                                
         'level' => 1,
                                                                                
         'number' => 20
                                                                                
       }
                                                                                
     },
-                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'node_next' => {
@@ -22203,16 +22075,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
       'extra' => {
                                                                                
         'associated_section' => {
                                                                                
           'cmdname' => 'chapter',
-                                                                               
           'extra' => {
-                                                                               
             'spaces_before_argument' => ' '
-                                                                               
           },
+                                                                               
           'extra' => {},
                                                                                
           'structure' => {
                                                                                
             'level' => 1,
                                                                                
             'number' => 21
                                                                                
           }
                                                                                
         },
-                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'node_next' => {
@@ -22220,16 +22089,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
           'extra' => {
                                                                                
             'associated_section' => {
                                                                                
               'cmdname' => 'chapter',
-                                                                               
               'extra' => {
-                                                                               
                 'spaces_before_argument' => ' '
-                                                                               
               },
+                                                                               
               'extra' => {},
                                                                                
               'structure' => {
                                                                                
                 'level' => 1,
                                                                                
                 'number' => 22
                                                                                
               }
                                                                                
             },
-                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
-                                                                               
             'spaces_before_argument' => ' '
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
                                                                                
           'structure' => {
                                                                                
             'node_next' => {
@@ -22237,16 +22103,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
               'extra' => {
                                                                                
                 'associated_section' => {
                                                                                
                   'cmdname' => 'chapter',
-                                                                               
                   'extra' => {
-                                                                               
                     'spaces_before_argument' => ' '
-                                                                               
                   },
+                                                                               
                   'extra' => {},
                                                                                
                   'structure' => {
                                                                                
                     'level' => 1,
                                                                                
                     'number' => 23
                                                                                
                   }
                                                                                
                 },
-                                                                               
                 'normalized' => '8_002e27in',
-                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
                 'normalized' => '8_002e27in'
                                                                                
               },
                                                                                
               'structure' => {
                                                                                
                 'node_next' => {
@@ -22254,16 +22117,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                   'extra' => {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'chapter',
-                                                                               
                       'extra' => {
-                                                                               
                         'spaces_before_argument' => ' '
-                                                                               
                       },
+                                                                               
                       'extra' => {},
                                                                                
                       'structure' => {
                                                                                
                         'level' => 1,
                                                                                
                         'number' => 24
                                                                                
                       }
                                                                                
                     },
-                                                                               
                     'normalized' => 'sansserif-slanted',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'node_next' => {
@@ -22271,16 +22131,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                       'extra' => {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'chapter',
-                                                                               
                           'extra' => {
-                                                                               
                             'spaces_before_argument' => ' '
-                                                                               
                           },
+                                                                               
                           'extra' => {},
                                                                                
                           'structure' => {
                                                                                
                             'level' => 1,
                                                                                
                             'number' => 25
                                                                                
                           }
                                                                                
                         },
-                                                                               
                         'normalized' => 'indicateurl',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'indicateurl'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'node_next' => {
@@ -22288,16 +22145,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                           'extra' => {
                                                                                
                             'associated_section' => {
                                                                                
                               'cmdname' => 'chapter',
-                                                                               
                               'extra' => {
-                                                                               
                                 'spaces_before_argument' => ' '
-                                                                               
                               },
+                                                                               
                               'extra' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'level' => 1,
                                                                                
                                 'number' => 26
                                                                                
                               }
                                                                                
                             },
-                                                                               
                             'normalized' => 'gH-3rd',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'gH-3rd'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'node_next' => {
@@ -22305,16 +22159,13 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                               'extra' => {
                                                                                
                                 'associated_section' => {
                                                                                
                                   'cmdname' => 'chapter',
-                                                                               
                                   'extra' => {
-                                                                               
                                     'spaces_before_argument' => ' '
-                                                                               
                                   },
+                                                                               
                                   'extra' => {},
                                                                                
                                   'structure' => {
                                                                                
                                     'level' => 1,
                                                                                
                                     'number' => 27
                                                                                
                                   }
                                                                                
                                 },
-                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'node_prev' => {},
@@ -22487,197 +22338,169 @@ 
$result_nodes{'at_commands_in_refs_latin1'}{'structure'}{'node_next'} = $result_
 $result_menus{'at_commands_in_refs_latin1'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '-_007b-_007d',
-        'spaces_before_argument' => ' '
+        'normalized' => '-_007b-_007d'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-            'spaces_before_argument' => ' '
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                'spaces_before_argument' => ' '
+                'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => '_2265-_2264-_2192',
-                            'spaces_before_argument' => ' '
+                            'normalized' => '_2265-_2264-_2192'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
                                           'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                                               },
                                               'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'_0131-_1e14-_1e08',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
                                                   'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
-                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
                                                       'structure' => {
                                                         'menu_next' => {
                                                           'cmdname' => 'node',
                                                           'extra' => {
-                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
                                                           'structure' => {
                                                             'menu_next' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
                                                               'structure' => {
                                                                 'menu_next' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
-                                                                    
'normalized' => 'AAA-AAA-BBB',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'AAA-AAA-BBB'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'menu_next' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
-                                                                        
'normalized' => 'CCC-CCC-DDD',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'CCC-CCC-DDD'
                                                                       },
                                                                       
'structure' => {
                                                                         
'menu_next' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
-                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
                                                                           
'structure' => {
                                                                             
'menu_next' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
-                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'menu_next' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
-                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'menu_next' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
-                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'menu_next' => {
                                                                                
           'cmdname' => 'node',
                                                                                
           'extra' => {
-                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
-                                                                               
             'spaces_before_argument' => ' '
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
                                                                                
           'structure' => {
                                                                                
             'menu_next' => {
                                                                                
               'cmdname' => 'node',
                                                                                
               'extra' => {
-                                                                               
                 'normalized' => '8_002e27in',
-                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
                 'normalized' => '8_002e27in'
                                                                                
               },
                                                                                
               'structure' => {
                                                                                
                 'menu_next' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
-                                                                               
                     'normalized' => 'sansserif-slanted',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'menu_next' => {
                                                                                
                       'cmdname' => 'node',
                                                                                
                       'extra' => {
-                                                                               
                         'normalized' => 'indicateurl',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'indicateurl'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'menu_next' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
-                                                                               
                             'normalized' => 'gH-3rd',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'gH-3rd'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'menu_next' => {
                                                                                
                               'cmdname' => 'node',
                                                                                
                               'extra' => {
-                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'menu_prev' => {},
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 4748ece1e2..f126ba7302 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
@@ -21108,12 +21108,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -21124,12 +21122,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '-_007b-_007d',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '-_007b-_007d'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21145,12 +21141,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '----_0021---_002e--_002e-_003f-_0040'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21167,12 +21161,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21189,12 +21181,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21211,12 +21201,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21233,12 +21221,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_2265-_2264-_2192',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_2265-_2264-_2192'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21255,12 +21241,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21277,12 +21261,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21299,12 +21281,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21321,12 +21301,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => '  '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21343,12 +21321,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21365,12 +21341,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0131-_1e14-_1e08',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0131-_1e14-_1e08'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21387,12 +21361,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21409,12 +21381,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21431,12 +21401,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21453,12 +21421,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'AAA-AAA-BBB',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'AAA-AAA-BBB'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21475,12 +21441,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'CCC-CCC-DDD',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'CCC-CCC-DDD'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21497,12 +21461,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21519,12 +21481,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21541,12 +21501,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '-_0040-_007b_007d-_002e-',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '-_0040-_007b_007d-_002e-'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21563,12 +21521,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21585,12 +21541,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21607,12 +21561,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '8_002e27in',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '8_002e27in'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21629,12 +21581,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'sansserif-slanted',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sansserif-slanted'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21651,12 +21601,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'indicateurl',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'indicateurl'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21673,12 +21621,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'gH-3rd',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'gH-3rd'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21695,12 +21641,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -21832,9 +21776,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -21842,20 +21784,10 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -21863,16 +21795,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => '-_007b-_007d',
-        'spaces_before_argument' => ' '
+        'normalized' => '-_007b-_007d'
       },
       'structure' => {
         'node_next' => {
@@ -21880,16 +21809,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-            'spaces_before_argument' => ' '
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
           },
           'structure' => {
             'node_next' => {
@@ -21897,16 +21823,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                'spaces_before_argument' => ' '
+                'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
               'structure' => {
                 'node_next' => {
@@ -21914,16 +21837,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {
                     'node_next' => {
@@ -21931,16 +21851,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
                       'structure' => {
                         'node_next' => {
@@ -21948,16 +21865,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'chapter',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 1,
                                 'number' => 6
                               }
                             },
-                            'normalized' => '_2265-_2264-_2192',
-                            'spaces_before_argument' => ' '
+                            'normalized' => '_2265-_2264-_2192'
                           },
                           'structure' => {
                             'node_next' => {
@@ -21965,16 +21879,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'chapter',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 1,
                                     'number' => 7
                                   }
                                 },
-                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -21982,16 +21893,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'chapter',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 1,
                                         'number' => 8
                                       }
                                     },
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -21999,16 +21907,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'chapter',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 1,
                                             'number' => 9
                                           }
                                         },
-                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
                                       'structure' => {
                                         'node_next' => {
@@ -22016,16 +21921,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
-                                              'extra' => {
-                                                'spaces_before_argument' => '  
'
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 1,
                                                 'number' => 10
                                               }
                                             },
-                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
                                           'structure' => {
                                             'node_next' => {
@@ -22033,16 +21935,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                               'extra' => {
                                                 'associated_section' => {
                                                   'cmdname' => 'chapter',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'level' => 1,
                                                     'number' => 11
                                                   }
                                                 },
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                                               },
                                               'structure' => {
                                                 'node_next' => {
@@ -22050,16 +21949,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                   'extra' => {
                                                     'associated_section' => {
                                                       'cmdname' => 'chapter',
-                                                      'extra' => {
-                                                        
'spaces_before_argument' => ' '
-                                                      },
+                                                      'extra' => {},
                                                       'structure' => {
                                                         'level' => 1,
                                                         'number' => 12
                                                       }
                                                     },
-                                                    'normalized' => 
'_0131-_1e14-_1e08',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
                                                   'structure' => {
                                                     'node_next' => {
@@ -22067,16 +21963,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                       'extra' => {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'chapter',
-                                                          'extra' => {
-                                                            
'spaces_before_argument' => ' '
-                                                          },
+                                                          'extra' => {},
                                                           'structure' => {
                                                             'level' => 1,
                                                             'number' => 13
                                                           }
                                                         },
-                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
                                                       'structure' => {
                                                         'node_next' => {
@@ -22084,16 +21977,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                           'extra' => {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'chapter',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 'level' => 1,
                                                                 'number' => 14
                                                               }
                                                             },
-                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
                                                           'structure' => {
                                                             'node_next' => {
@@ -22101,16 +21991,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                               'extra' => {
                                                                 
'associated_section' => {
                                                                   'cmdname' => 
'chapter',
-                                                                  'extra' => {
-                                                                    
'spaces_before_argument' => ' '
-                                                                  },
+                                                                  'extra' => 
{},
                                                                   'structure' 
=> {
                                                                     'level' => 
1,
                                                                     'number' 
=> 15
                                                                   }
                                                                 },
-                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
                                                               'structure' => {
                                                                 'node_next' => 
{
@@ -22118,16 +22005,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                   'extra' => {
                                                                     
'associated_section' => {
                                                                       
'cmdname' => 'chapter',
-                                                                      'extra' 
=> {
-                                                                        
'spaces_before_argument' => ' '
-                                                                      },
+                                                                      'extra' 
=> {},
                                                                       
'structure' => {
                                                                         
'level' => 1,
                                                                         
'number' => 16
                                                                       }
                                                                     },
-                                                                    
'normalized' => 'AAA-AAA-BBB',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'AAA-AAA-BBB'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'node_next' => {
@@ -22135,16 +22019,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                       'extra' 
=> {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'chapter',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'level' => 1,
                                                                             
'number' => 17
                                                                           }
                                                                         },
-                                                                        
'normalized' => 'CCC-CCC-DDD',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'CCC-CCC-DDD'
                                                                       },
                                                                       
'structure' => {
                                                                         
'node_next' => {
@@ -22152,16 +22033,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                           
'extra' => {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'chapter',
-                                                                              
'extra' => {
-                                                                               
 'spaces_before_argument' => ' '
-                                                                              
},
+                                                                              
'extra' => {},
                                                                               
'structure' => {
                                                                                
 'level' => 1,
                                                                                
 'number' => 18
                                                                               }
                                                                             },
-                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
                                                                           
'structure' => {
                                                                             
'node_next' => {
@@ -22169,16 +22047,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                               
'extra' => {
                                                                                
 'associated_section' => {
                                                                                
   'cmdname' => 'chapter',
-                                                                               
   'extra' => {
-                                                                               
     'spaces_before_argument' => ' '
-                                                                               
   },
+                                                                               
   'extra' => {},
                                                                                
   'structure' => {
                                                                                
     'level' => 1,
                                                                                
     'number' => 19
                                                                                
   }
                                                                                
 },
-                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'node_next' => {
@@ -22186,16 +22061,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
   'extra' => {
                                                                                
     'associated_section' => {
                                                                                
       'cmdname' => 'chapter',
-                                                                               
       'extra' => {
-                                                                               
         'spaces_before_argument' => ' '
-                                                                               
       },
+                                                                               
       'extra' => {},
                                                                                
       'structure' => {
                                                                                
         'level' => 1,
                                                                                
         'number' => 20
                                                                                
       }
                                                                                
     },
-                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'node_next' => {
@@ -22203,16 +22075,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
       'extra' => {
                                                                                
         'associated_section' => {
                                                                                
           'cmdname' => 'chapter',
-                                                                               
           'extra' => {
-                                                                               
             'spaces_before_argument' => ' '
-                                                                               
           },
+                                                                               
           'extra' => {},
                                                                                
           'structure' => {
                                                                                
             'level' => 1,
                                                                                
             'number' => 21
                                                                                
           }
                                                                                
         },
-                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'node_next' => {
@@ -22220,16 +22089,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
           'extra' => {
                                                                                
             'associated_section' => {
                                                                                
               'cmdname' => 'chapter',
-                                                                               
               'extra' => {
-                                                                               
                 'spaces_before_argument' => ' '
-                                                                               
               },
+                                                                               
               'extra' => {},
                                                                                
               'structure' => {
                                                                                
                 'level' => 1,
                                                                                
                 'number' => 22
                                                                                
               }
                                                                                
             },
-                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
-                                                                               
             'spaces_before_argument' => ' '
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
                                                                                
           'structure' => {
                                                                                
             'node_next' => {
@@ -22237,16 +22103,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
               'extra' => {
                                                                                
                 'associated_section' => {
                                                                                
                   'cmdname' => 'chapter',
-                                                                               
                   'extra' => {
-                                                                               
                     'spaces_before_argument' => ' '
-                                                                               
                   },
+                                                                               
                   'extra' => {},
                                                                                
                   'structure' => {
                                                                                
                     'level' => 1,
                                                                                
                     'number' => 23
                                                                                
                   }
                                                                                
                 },
-                                                                               
                 'normalized' => '8_002e27in',
-                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
                 'normalized' => '8_002e27in'
                                                                                
               },
                                                                                
               'structure' => {
                                                                                
                 'node_next' => {
@@ -22254,16 +22117,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                   'extra' => {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'chapter',
-                                                                               
                       'extra' => {
-                                                                               
                         'spaces_before_argument' => ' '
-                                                                               
                       },
+                                                                               
                       'extra' => {},
                                                                                
                       'structure' => {
                                                                                
                         'level' => 1,
                                                                                
                         'number' => 24
                                                                                
                       }
                                                                                
                     },
-                                                                               
                     'normalized' => 'sansserif-slanted',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'node_next' => {
@@ -22271,16 +22131,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                       'extra' => {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'chapter',
-                                                                               
                           'extra' => {
-                                                                               
                             'spaces_before_argument' => ' '
-                                                                               
                           },
+                                                                               
                           'extra' => {},
                                                                                
                           'structure' => {
                                                                                
                             'level' => 1,
                                                                                
                             'number' => 25
                                                                                
                           }
                                                                                
                         },
-                                                                               
                         'normalized' => 'indicateurl',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'indicateurl'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'node_next' => {
@@ -22288,16 +22145,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                           'extra' => {
                                                                                
                             'associated_section' => {
                                                                                
                               'cmdname' => 'chapter',
-                                                                               
                               'extra' => {
-                                                                               
                                 'spaces_before_argument' => ' '
-                                                                               
                               },
+                                                                               
                               'extra' => {},
                                                                                
                               'structure' => {
                                                                                
                                 'level' => 1,
                                                                                
                                 'number' => 26
                                                                                
                               }
                                                                                
                             },
-                                                                               
                             'normalized' => 'gH-3rd',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'gH-3rd'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'node_next' => {
@@ -22305,16 +22159,13 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                               'extra' => {
                                                                                
                                 'associated_section' => {
                                                                                
                                   'cmdname' => 'chapter',
-                                                                               
                                   'extra' => {
-                                                                               
                                     'spaces_before_argument' => ' '
-                                                                               
                                   },
+                                                                               
                                   'extra' => {},
                                                                                
                                   'structure' => {
                                                                                
                                     'level' => 1,
                                                                                
                                     'number' => 27
                                                                                
                                   }
                                                                                
                                 },
-                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'node_prev' => {},
@@ -22487,197 +22338,169 @@ 
$result_nodes{'at_commands_in_refs_utf8'}{'structure'}{'node_next'} = $result_no
 $result_menus{'at_commands_in_refs_utf8'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '-_007b-_007d',
-        'spaces_before_argument' => ' '
+        'normalized' => '-_007b-_007d'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '----_0021---_002e--_002e-_003f-_0040',
-            'spaces_before_argument' => ' '
+            'normalized' => '----_0021---_002e--_002e-_003f-_0040'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_0040-_007b-_007d-_005c-_0023',
-                'spaces_before_argument' => ' '
+                'normalized' => '_0040-_007b-_007d-_005c-_0023'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => '_2265-_2264-_2192',
-                            'spaces_before_argument' => ' '
+                            'normalized' => '_2265-_2264-_2192'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_21d2-_00b0-a-b--_00e5',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_21d2-_00b0-a-b--_00e5'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                                       },
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                                           },
                                           'structure' => {
                                             'menu_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
                                               },
                                               'structure' => {
                                                 'menu_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'_0131-_1e14-_1e08',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'_0131-_1e14-_1e08'
                                                   },
                                                   'structure' => {
                                                     'menu_next' => {
                                                       'cmdname' => 'node',
                                                       'extra' => {
-                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
                                                       },
                                                       'structure' => {
                                                         'menu_next' => {
                                                           'cmdname' => 'node',
                                                           'extra' => {
-                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                                                           },
                                                           'structure' => {
                                                             'menu_next' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
                                                               },
                                                               'structure' => {
                                                                 'menu_next' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
-                                                                    
'normalized' => 'AAA-AAA-BBB',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'AAA-AAA-BBB'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'menu_next' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
-                                                                        
'normalized' => 'CCC-CCC-DDD',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'CCC-CCC-DDD'
                                                                       },
                                                                       
'structure' => {
                                                                         
'menu_next' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
-                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
                                                                           },
                                                                           
'structure' => {
                                                                             
'menu_next' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
-                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'menu_next' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
-                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => '-_0040-_007b_007d-_002e-'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'menu_next' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
-                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'menu_next' => {
                                                                                
           'cmdname' => 'node',
                                                                                
           'extra' => {
-                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC',
-                                                                               
             'spaces_before_argument' => ' '
+                                                                               
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
                                                                                
           },
                                                                                
           'structure' => {
                                                                                
             'menu_next' => {
                                                                                
               'cmdname' => 'node',
                                                                                
               'extra' => {
-                                                                               
                 'normalized' => '8_002e27in',
-                                                                               
                 'spaces_before_argument' => ' '
+                                                                               
                 'normalized' => '8_002e27in'
                                                                                
               },
                                                                                
               'structure' => {
                                                                                
                 'menu_next' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
-                                                                               
                     'normalized' => 'sansserif-slanted',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'sansserif-slanted'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'menu_next' => {
                                                                                
                       'cmdname' => 'node',
                                                                                
                       'extra' => {
-                                                                               
                         'normalized' => 'indicateurl',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'indicateurl'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'menu_next' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
-                                                                               
                             'normalized' => 'gH-3rd',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'gH-3rd'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'menu_next' => {
                                                                                
                               'cmdname' => 'node',
                                                                                
                               'extra' => {
-                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls',
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'menu_prev' => {},
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 f4eed370e2..5fdbd690cb 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
@@ -1717,12 +1717,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1733,12 +1731,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1754,12 +1750,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e9',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e9'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1776,12 +1770,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0-_00e8-_00f9',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0-_00e8-_00f9'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1798,12 +1790,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1820,12 +1810,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e7',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e7'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1869,9 +1857,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1880,20 +1866,10 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1901,16 +1877,13 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-        'spaces_before_argument' => ' '
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
       'structure' => {
         'node_next' => {
@@ -1918,16 +1891,13 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => '_00e9',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e9'
           },
           'structure' => {
             'node_next' => {
@@ -1935,16 +1905,13 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => '_00e0-_00e8-_00f9',
-                'spaces_before_argument' => ' '
+                'normalized' => '_00e0-_00e8-_00f9'
               },
               'structure' => {
                 'node_next' => {
@@ -1952,16 +1919,13 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
                   'structure' => {
                     'node_next' => {
@@ -1969,16 +1933,13 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => '_00e7',
-                        'spaces_before_argument' => ' '
+                        'normalized' => '_00e7'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -2020,43 +1981,37 @@ $result_menus{'char_latin1_latin1_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-        'spaces_before_argument' => ' '
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e9',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e9'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_00e0-_00e8-_00f9',
-                'spaces_before_argument' => ' '
+                'normalized' => '_00e0-_00e8-_00f9'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => '_00e7',
-                        'spaces_before_argument' => ' '
+                        'normalized' => '_00e7'
                       },
                       'structure' => {
                         'menu_prev' => {},
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 e5b52a3bc2..de75a4f37a 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
@@ -1717,12 +1717,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1733,12 +1731,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1754,12 +1750,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e9',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e9'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1776,12 +1770,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0-_00e8-_00f9',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0-_00e8-_00f9'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1798,12 +1790,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1820,12 +1810,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e7',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e7'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1869,9 +1857,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1880,20 +1866,10 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1901,16 +1877,13 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-        'spaces_before_argument' => ' '
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
       'structure' => {
         'node_next' => {
@@ -1918,16 +1891,13 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => '_00e9',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e9'
           },
           'structure' => {
             'node_next' => {
@@ -1935,16 +1905,13 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => '_00e0-_00e8-_00f9',
-                'spaces_before_argument' => ' '
+                'normalized' => '_00e0-_00e8-_00f9'
               },
               'structure' => {
                 'node_next' => {
@@ -1952,16 +1919,13 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
                   'structure' => {
                     'node_next' => {
@@ -1969,16 +1933,13 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => '_00e7',
-                        'spaces_before_argument' => ' '
+                        'normalized' => '_00e7'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -2020,43 +1981,37 @@ $result_menus{'char_latin1_utf8_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
-        'spaces_before_argument' => ' '
+        'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e9',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e9'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => '_00e0-_00e8-_00f9',
-                'spaces_before_argument' => ' '
+                'normalized' => '_00e0-_00e8-_00f9'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => '_00e7',
-                        'spaces_before_argument' => ' '
+                        'normalized' => '_00e7'
                       },
                       'structure' => {
                         'menu_prev' => {},
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 f289e327b4..90ef64b8e3 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
@@ -665,12 +665,10 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -681,12 +679,10 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_0104-_0105-_02db-_0118-_0119',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_0104-_0105-_02db-_0118-_0119'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -713,9 +709,7 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -724,20 +718,10 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -745,16 +729,13 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => '_0104-_0105-_02db-_0118-_0119',
-        'spaces_before_argument' => ' '
+        'normalized' => '_0104-_0105-_02db-_0118-_0119'
       },
       'structure' => {
         'node_prev' => {},
@@ -772,15 +753,13 @@ $result_menus{'char_latin2_latin2_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_0104-_0105-_02db-_0118-_0119',
-        'spaces_before_argument' => ' '
+        'normalized' => '_0104-_0105-_02db-_0118-_0119'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index b51a51e3cc..abb47588ad 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -1020,12 +1020,10 @@ $result_sectioning{'japanese_shift_jis'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1036,12 +1034,10 @@ $result_sectioning{'japanese_shift_jis'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Preface',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Preface'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1057,12 +1053,10 @@ $result_sectioning{'japanese_shift_jis'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Introduction',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Introduction'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1094,9 +1088,7 @@ $result_nodes{'japanese_shift_jis'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1104,20 +1096,10 @@ $result_nodes{'japanese_shift_jis'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1125,16 +1107,13 @@ $result_nodes{'japanese_shift_jis'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Preface',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Preface'
       },
       'structure' => {
         'node_next' => {
@@ -1142,16 +1121,13 @@ $result_nodes{'japanese_shift_jis'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'Introduction',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Introduction'
           },
           'structure' => {
             'node_prev' => {},
@@ -1174,22 +1150,19 @@ 
$result_nodes{'japanese_shift_jis'}{'structure'}{'node_next'} = $result_nodes{'j
 $result_menus{'japanese_shift_jis'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Preface',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Preface'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Introduction',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Introduction'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index ec97ceec6c..851135ac51 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -1731,12 +1731,10 @@ $result_sectioning{'sample_utf8'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1747,12 +1745,10 @@ $result_sectioning{'sample_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1768,12 +1764,10 @@ $result_sectioning{'sample_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1791,12 +1785,10 @@ $result_sectioning{'sample_utf8'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'Index-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Index-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1831,9 +1823,7 @@ $result_nodes{'sample_utf8'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1841,20 +1831,10 @@ $result_nodes{'sample_utf8'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1862,16 +1842,13 @@ $result_nodes{'sample_utf8'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
-        'spaces_before_argument' => ' '
+        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
       },
       'structure' => {
         'node_next' => {
@@ -1879,16 +1856,13 @@ $result_nodes{'sample_utf8'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
           },
           'structure' => {
             'node_next' => {
@@ -1896,16 +1870,13 @@ $result_nodes{'sample_utf8'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'unnumbered',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1
                   }
                 },
                 'isindex' => 1,
-                'normalized' => 'Index-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Index-node'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1934,30 +1905,26 @@ $result_nodes{'sample_utf8'}{'structure'}{'node_next'} 
= $result_nodes{'sample_u
 $result_menus{'sample_utf8'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
-        'spaces_before_argument' => ' '
+        'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'Index-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Index-node'
               },
               'structure' => {
                 'menu_prev' => {},
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index c53f22c196..6093133eeb 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -585,11 +585,9 @@ $result_sectioning{'weird_accents'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -606,23 +604,19 @@ $result_nodes{'weird_accents'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'weird_accents'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 3a33778452..222848d8d2 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -585,11 +585,9 @@ $result_sectioning{'weird_accents_disable_encoding'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -606,23 +604,19 @@ $result_nodes{'weird_accents_disable_encoding'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'weird_accents_disable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 0fa40c5b38..8d248f8660 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -432,16 +432,14 @@ This is ifnottex text.
 $result_nodes{'cond'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 0501299c09..406fdf5c15 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -449,16 +449,14 @@ This is iftex text.
 $result_nodes{'cond_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/cond_info.pl 
b/tp/t/results/formatting/cond_info.pl
index 678191f398..4d199bcede 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -415,16 +415,14 @@ This is ifnottex text.
 $result_nodes{'cond_info'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond_info'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 9b97a44dff..b13c9fa410 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -449,16 +449,14 @@ This is iftex text.
 $result_nodes{'cond_info_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond_info_ifhtml_ifinfo_iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 5967dae623..cf35757668 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
@@ -415,16 +415,14 @@ This is ifnottex text.
 $result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 0ab7da837b..69d72c15e3 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
@@ -415,16 +415,14 @@ This is ifnottex text.
 $result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/cond_xml.pl 
b/tp/t/results/formatting/cond_xml.pl
index e5a6a5a247..cd61a7a710 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -415,16 +415,14 @@ This is ifnottex text.
 $result_nodes{'cond_xml'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'cond_xml'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index 640a6218b6..be598713b8 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -1173,12 +1173,10 @@ $result_sectioning{'direntry_dircategory_info_split'} = 
{
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1189,12 +1187,10 @@ $result_sectioning{'direntry_dircategory_info_split'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1221,9 +1217,7 @@ $result_nodes{'direntry_dircategory_info_split'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1231,20 +1225,10 @@ $result_nodes{'direntry_dircategory_info_split'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1252,16 +1236,13 @@ $result_nodes{'direntry_dircategory_info_split'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1278,15 +1259,13 @@ 
$result_nodes{'direntry_dircategory_info_split'}{'structure'}{'node_next'} = $re
 $result_menus{'direntry_dircategory_info_split'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/formatting/documentlanguage_set_option.pl 
b/tp/t/results/formatting/documentlanguage_set_option.pl
index 96326047c3..eeea44cc4a 100644
--- a/tp/t/results/formatting/documentlanguage_set_option.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option.pl
@@ -329,11 +329,9 @@ $result_sectioning{'documentlanguage_set_option'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -350,23 +348,19 @@ $result_nodes{'documentlanguage_set_option'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'documentlanguage_set_option'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/documentlanguage_set_option_info.pl 
b/tp/t/results/formatting/documentlanguage_set_option_info.pl
index 02bf4761e5..5705abf354 100644
--- a/tp/t/results/formatting/documentlanguage_set_option_info.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option_info.pl
@@ -329,11 +329,9 @@ $result_sectioning{'documentlanguage_set_option_info'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -350,23 +348,19 @@ $result_nodes{'documentlanguage_set_option_info'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'documentlanguage_set_option_info'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/documentlanguage_set_unknown.pl 
b/tp/t/results/formatting/documentlanguage_set_unknown.pl
index 46587aecbc..7bd32cde00 100644
--- a/tp/t/results/formatting/documentlanguage_set_unknown.pl
+++ b/tp/t/results/formatting/documentlanguage_set_unknown.pl
@@ -329,11 +329,9 @@ $result_sectioning{'documentlanguage_set_unknown'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -350,23 +348,19 @@ $result_nodes{'documentlanguage_set_unknown'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'documentlanguage_set_unknown'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index 835e478a1e..59557995a0 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -1800,12 +1800,10 @@ $result_sectioning{'float_copying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1817,12 +1815,10 @@ $result_sectioning{'float_copying'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'Copying-and-floats',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Copying-and-floats'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1849,9 +1845,7 @@ $result_nodes{'float_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1859,20 +1853,10 @@ $result_nodes{'float_copying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1880,17 +1864,14 @@ $result_nodes{'float_copying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'appendix',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 'A'
           }
         },
         'isindex' => 1,
-        'normalized' => 'Copying-and-floats',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Copying-and-floats'
       },
       'structure' => {
         'node_prev' => {},
@@ -1907,16 +1888,14 @@ 
$result_nodes{'float_copying'}{'structure'}{'node_next'} = $result_nodes{'float_
 $result_menus{'float_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'Copying-and-floats',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Copying-and-floats'
       },
       'structure' => {
         'menu_up' => {},
@@ -1944,16 +1923,7 @@ $result_floats{'float_copying'} = {
           },
           'structure' => {}
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'public-domain',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/formatting/simplest_test_date_in_header.pl 
b/tp/t/results/formatting/simplest_test_date_in_header.pl
index f02223e2bb..66f853e99d 100644
--- a/tp/t/results/formatting/simplest_test_date_in_header.pl
+++ b/tp/t/results/formatting/simplest_test_date_in_header.pl
@@ -204,16 +204,14 @@ This is a very simple texi manual   <>.
 $result_nodes{'simplest_test_date_in_header'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'simplest_test_date_in_header'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/simplest_test_prefix.pl 
b/tp/t/results/formatting/simplest_test_prefix.pl
index cc81058f63..717ad577bf 100644
--- a/tp/t/results/formatting/simplest_test_prefix.pl
+++ b/tp/t/results/formatting/simplest_test_prefix.pl
@@ -204,16 +204,14 @@ This is a very simple texi manual   <>.
 $result_nodes{'simplest_test_prefix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'simplest_test_prefix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/simplest_test_prefix_info.pl 
b/tp/t/results/formatting/simplest_test_prefix_info.pl
index 7764f0aee4..f0b0f6a1fa 100644
--- a/tp/t/results/formatting/simplest_test_prefix_info.pl
+++ b/tp/t/results/formatting/simplest_test_prefix_info.pl
@@ -204,16 +204,14 @@ This is a very simple texi manual   <>.
 $result_nodes{'simplest_test_prefix_info'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'simplest_test_prefix_info'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/split_for_format_not_split.pl 
b/tp/t/results/formatting/split_for_format_not_split.pl
index 5ff5ec2297..ee9a1667ce 100644
--- a/tp/t/results/formatting/split_for_format_not_split.pl
+++ b/tp/t/results/formatting/split_for_format_not_split.pl
@@ -204,16 +204,14 @@ This is a very simple texi manual   <>.
 $result_nodes{'split_for_format_not_split'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'split_for_format_not_split'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index 65371e1823..000120c1c0 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -484,12 +484,10 @@ $result_sectioning{'split_nocopying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -500,12 +498,10 @@ $result_sectioning{'split_nocopying'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Ch1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Ch1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -532,9 +528,7 @@ $result_nodes{'split_nocopying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -542,20 +536,10 @@ $result_nodes{'split_nocopying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -563,16 +547,13 @@ $result_nodes{'split_nocopying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Ch1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Ch1'
       },
       'structure' => {
         'node_prev' => {},
@@ -589,15 +570,13 @@ 
$result_nodes{'split_nocopying'}{'structure'}{'node_next'} = $result_nodes{'spli
 $result_menus{'split_nocopying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Ch1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Ch1'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/formatting/split_nocopying_split.pl
index d854bb36ff..2d6efa40d0 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -484,12 +484,10 @@ $result_sectioning{'split_nocopying_split'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -500,12 +498,10 @@ $result_sectioning{'split_nocopying_split'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Ch1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Ch1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -532,9 +528,7 @@ $result_nodes{'split_nocopying_split'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -542,20 +536,10 @@ $result_nodes{'split_nocopying_split'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -563,16 +547,13 @@ $result_nodes{'split_nocopying_split'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Ch1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Ch1'
       },
       'structure' => {
         'node_prev' => {},
@@ -589,15 +570,13 @@ 
$result_nodes{'split_nocopying_split'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'split_nocopying_split'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Ch1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Ch1'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 19ac819344..8637828111 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5412,12 +5412,10 @@ $result_sectioning{'texi_bib_example'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -5428,12 +5426,10 @@ $result_sectioning{'texi_bib_example'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Introduction',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Introduction'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -5449,12 +5445,10 @@ $result_sectioning{'texi_bib_example'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'References',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'References'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -5486,9 +5480,7 @@ $result_nodes{'texi_bib_example'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -5496,20 +5488,10 @@ $result_nodes{'texi_bib_example'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -5517,16 +5499,13 @@ $result_nodes{'texi_bib_example'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Introduction',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Introduction'
       },
       'structure' => {
         'node_next' => {
@@ -5534,16 +5513,13 @@ $result_nodes{'texi_bib_example'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'References',
-            'spaces_before_argument' => ' '
+            'normalized' => 'References'
           },
           'structure' => {
             'node_prev' => {},
@@ -5566,22 +5542,19 @@ 
$result_nodes{'texi_bib_example'}{'structure'}{'node_next'} = $result_nodes{'tex
 $result_menus{'texi_bib_example'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Introduction',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Introduction'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'References',
-            'spaces_before_argument' => ' '
+            'normalized' => 'References'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/formatting/texi_cond.pl 
b/tp/t/results/formatting/texi_cond.pl
index 721311b880..d7a878f4e3 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -432,16 +432,14 @@ This is ifnottex text.
 $result_nodes{'texi_cond'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'texi_cond'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 4779c90458..cd027ae985 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1408,12 +1408,10 @@ $result_sectioning{'texi_glossary'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1424,12 +1422,10 @@ $result_sectioning{'texi_glossary'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'glossary',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'glossary'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1456,9 +1452,7 @@ $result_nodes{'texi_glossary'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1466,20 +1460,10 @@ $result_nodes{'texi_glossary'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1487,16 +1471,13 @@ $result_nodes{'texi_glossary'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'glossary',
-        'spaces_before_argument' => ' '
+        'normalized' => 'glossary'
       },
       'structure' => {
         'node_prev' => {},
@@ -1513,15 +1494,13 @@ 
$result_nodes{'texi_glossary'}{'structure'}{'node_next'} = $result_nodes{'texi_g
 $result_menus{'texi_glossary'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'glossary',
-        'spaces_before_argument' => ' '
+        'normalized' => 'glossary'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 3c658138cb..5e1ab3735c 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -373,16 +373,14 @@ $result_texts{'heading_in_copying'} = '
 $result_nodes{'heading_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'heading_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index 46e795f646..a8b697ad68 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -236,17 +236,13 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -257,17 +253,13 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'section_up' => {}
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index cce79880e8..a915c4c6c2 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -698,12 +698,10 @@ $result_sectioning{'check_htmlxref'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -720,9 +718,7 @@ $result_nodes{'check_htmlxref'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -730,27 +726,16 @@ $result_nodes{'check_htmlxref'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'node_next' => {
@@ -790,15 +775,13 @@ $result_nodes{'check_htmlxref'}{'structure'}{'node_prev'} 
= $result_nodes{'check
 $result_menus{'check_htmlxref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_next' => {
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 c7dc08ab65..6ccd8ebf5e 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -709,11 +709,9 @@ $result_sectioning{'deftypefnnewline_for_copying_after'} = 
{
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -730,23 +728,19 @@ $result_nodes{'deftypefnnewline_for_copying_after'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'deftypefnnewline_for_copying_after'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 ab6e2d5887..4df5e5f2c1 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -660,11 +660,9 @@ $result_sectioning{'deftypefnnewline_for_copying_before'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -681,23 +679,19 @@ $result_nodes{'deftypefnnewline_for_copying_before'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'deftypefnnewline_for_copying_before'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index 70c871a8dc..ecb13ba5c9 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -390,9 +390,7 @@ $result_sectioning{'documentdescription'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 008b792515..a763d6405b 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -201,11 +201,9 @@ 
$result_sectioning{'empty_lines_at_beginning_no_setfilename'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -222,23 +220,19 @@ $result_nodes{'empty_lines_at_beginning_no_setfilename'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'empty_lines_at_beginning_no_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index bada8cef68..7e1401a21f 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -551,8 +551,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -568,8 +567,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chap-f',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chap-f'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -578,8 +576,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -601,8 +598,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'chap-s',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'chap-s'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -611,8 +607,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                               'section' => {
                                 'cmdname' => 'chapter',
                                 'extra' => {
-                                  'associated_node' => {},
-                                  'spaces_before_argument' => ' '
+                                  'associated_node' => {}
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -666,8 +661,7 @@ $result_sectioning{'footnotestyle_separate_late'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -737,9 +731,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -756,17 +748,14 @@ $result_nodes{'footnotestyle_separate_late'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chap-f',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chap-f'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -775,9 +764,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
                         'extra' => {
                           'associated_section' => {
                             'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -804,8 +791,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
                               'number' => 2
                             }
                           },
-                          'normalized' => 'chap-s',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'chap-s'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -852,8 +838,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -909,8 +894,7 @@ 
$result_nodes{'footnotestyle_separate_late'}{'structure'}{'node_next'} = $result
 $result_menus{'footnotestyle_separate_late'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -918,9 +902,7 @@ $result_menus{'footnotestyle_separate_late'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -935,8 +917,7 @@ $result_menus{'footnotestyle_separate_late'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chap-f',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chap-f'
                 },
                 'structure' => {
                   'associated_unit' => {}
@@ -944,9 +925,7 @@ $result_menus{'footnotestyle_separate_late'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -964,8 +943,7 @@ $result_menus{'footnotestyle_separate_late'} = {
                     'node' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'chap-s',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chap-s'
                       },
                       'structure' => {
                         'associated_unit' => {}
@@ -973,9 +951,7 @@ $result_menus{'footnotestyle_separate_late'} = {
                     },
                     'section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -1074,8 +1050,7 @@ $result_elements{'footnotestyle_separate_late'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {}
@@ -1083,9 +1058,7 @@ $result_elements{'footnotestyle_separate_late'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -1100,8 +1073,7 @@ $result_elements{'footnotestyle_separate_late'} = [
             'node' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chap-f',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chap-f'
               },
               'structure' => {
                 'associated_unit' => {}
@@ -1109,9 +1081,7 @@ $result_elements{'footnotestyle_separate_late'} = [
             },
             'section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
@@ -1129,8 +1099,7 @@ $result_elements{'footnotestyle_separate_late'} = [
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'chap-s',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chap-s'
                     },
                     'structure' => {
                       'associated_unit' => {}
@@ -1138,9 +1107,7 @@ $result_elements{'footnotestyle_separate_late'} = [
                   },
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 8831d677b3..05eab8e5cd 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -303,11 +303,9 @@ $result_sectioning{'html_in_copying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -324,23 +322,19 @@ $result_nodes{'html_in_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'html_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 99461e1cef..444901ca6a 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -214,9 +214,7 @@ $result_sectioning{'index_and_node_same_name'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
@@ -231,8 +229,7 @@ $result_nodes{'index_and_node_same_name'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'index-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'index-node'
   }
 };
 
@@ -240,8 +237,7 @@ $result_menus{'index_and_node_same_name'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'index-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'index-node'
   }
 };
 
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 8db8cb30e3..eba399f5a5 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -286,9 +286,7 @@ $result_sectioning{'index_below'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -301,9 +299,7 @@ $result_sectioning{'index_below'} = {
                   'extra' => {
                     'section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -311,9 +307,7 @@ $result_sectioning{'index_below'} = {
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -420,9 +414,7 @@ $result_elements{'index_below'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -436,9 +428,7 @@ $result_elements{'index_below'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
@@ -455,9 +445,7 @@ $result_elements{'index_below'} = [
                 'extra' => {
                   'section' => {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 2,
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index e89a1f50e7..ebf11474c7 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -1366,8 +1366,7 @@ $result_sectioning{'redirection_same_labels'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -1383,8 +1382,7 @@ $result_sectioning{'redirection_same_labels'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'umlaut',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'umlaut'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -1393,8 +1391,7 @@ $result_sectioning{'redirection_same_labels'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1416,8 +1413,7 @@ $result_sectioning{'redirection_same_labels'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'circumflex',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'circumflex'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -1426,8 +1422,7 @@ $result_sectioning{'redirection_same_labels'} = {
                               'section' => {
                                 'cmdname' => 'chapter',
                                 'extra' => {
-                                  'associated_node' => {},
-                                  'spaces_before_argument' => ' '
+                                  'associated_node' => {}
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -1482,8 +1477,7 @@ $result_sectioning{'redirection_same_labels'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -1554,9 +1548,7 @@ $result_nodes{'redirection_same_labels'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -1573,9 +1565,7 @@ $result_nodes{'redirection_same_labels'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
@@ -1585,36 +1575,24 @@ $result_nodes{'redirection_same_labels'} = {
                       'menus' => [
                         {
                           'cmdname' => 'menu',
-                          'extra' => {
-                            'end_command' => {
-                              'cmdname' => 'end',
-                              'extra' => {
-                                'command_argument' => 'menu',
-                                'spaces_before_argument' => ' ',
-                                'text_arg' => 'menu'
-                              }
-                            }
-                          }
+                          'extra' => {}
                         }
                       ],
-                      'normalized' => 'umlaut',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'umlaut'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'menu_child' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => '_00ef',
-                          'spaces_before_argument' => ' '
+                          'normalized' => '_00ef'
                         },
                         'structure' => {
                           'associated_unit' => {},
                           'node_next' => {
                             'cmdname' => 'node',
                             'extra' => {
-                              'normalized' => '_0129',
-                              'spaces_before_argument' => ' '
+                              'normalized' => '_0129'
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -1630,9 +1608,7 @@ $result_nodes{'redirection_same_labels'} = {
                         'extra' => {
                           'associated_section' => {
                             'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -1663,28 +1639,17 @@ $result_nodes{'redirection_same_labels'} = {
                           'menus' => [
                             {
                               'cmdname' => 'menu',
-                              'extra' => {
-                                'end_command' => {
-                                  'cmdname' => 'end',
-                                  'extra' => {
-                                    'command_argument' => 'menu',
-                                    'spaces_before_argument' => ' ',
-                                    'text_arg' => 'menu'
-                                  }
-                                }
-                              }
+                              'extra' => {}
                             }
                           ],
-                          'normalized' => 'circumflex',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'circumflex'
                         },
                         'structure' => {
                           'associated_unit' => {},
                           'menu_child' => {
                             'cmdname' => 'node',
                             'extra' => {
-                              'normalized' => '_00ee',
-                              'spaces_before_argument' => ' '
+                              'normalized' => '_00ee'
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -1737,20 +1702,10 @@ $result_nodes{'redirection_same_labels'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -1816,8 +1771,7 @@ 
$result_nodes{'redirection_same_labels'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'redirection_same_labels'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1825,9 +1779,7 @@ $result_menus{'redirection_same_labels'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1842,24 +1794,21 @@ $result_menus{'redirection_same_labels'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'umlaut',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'umlaut'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_child' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => '_00ef',
-                      'spaces_before_argument' => ' '
+                      'normalized' => '_00ef'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'menu_next' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => '_0129',
-                          'spaces_before_argument' => ' '
+                          'normalized' => '_0129'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -1879,8 +1828,7 @@ $result_menus{'redirection_same_labels'} = {
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'circumflex',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'circumflex'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -1888,9 +1836,7 @@ $result_menus{'redirection_same_labels'} = {
                           'node' => {},
                           'section' => {
                             'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 1,
@@ -1918,8 +1864,7 @@ $result_menus{'redirection_same_labels'} = {
                       'menu_child' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => '_00ee',
-                          'spaces_before_argument' => ' '
+                          'normalized' => '_00ee'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -1944,9 +1889,7 @@ $result_menus{'redirection_same_labels'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -2049,16 +1992,14 @@ $result_elements{'redirection_same_labels'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'umlaut',
-              'spaces_before_argument' => ' '
+              'normalized' => 'umlaut'
             },
             'structure' => {
               'associated_unit' => {
@@ -2066,9 +2007,7 @@ $result_elements{'redirection_same_labels'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -2086,16 +2025,14 @@ $result_elements{'redirection_same_labels'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'circumflex',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'circumflex'
                           },
                           'structure' => {
                             'associated_unit' => {},
                             'menu_child' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => '_00ee',
-                                'spaces_before_argument' => ' '
+                                'normalized' => '_00ee'
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -2114,9 +2051,7 @@ $result_elements{'redirection_same_labels'} = [
                         },
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -2156,16 +2091,14 @@ $result_elements{'redirection_same_labels'} = [
               'menu_child' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => '_00ef',
-                  'spaces_before_argument' => ' '
+                  'normalized' => '_00ef'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => '_0129',
-                      'spaces_before_argument' => ' '
+                      'normalized' => '_0129'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -2193,9 +2126,7 @@ $result_elements{'redirection_same_labels'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 988ce138b5..f64c50e518 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -409,27 +409,16 @@ $result_nodes{'ref_in_preformatted'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nnn-the-node-name',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nnn-the-node-name'
       },
       'structure' => {
         'node_prev' => {},
@@ -446,15 +435,13 @@ 
$result_nodes{'ref_in_preformatted'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'ref_in_preformatted'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nnn-the-node-name',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nnn-the-node-name'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index e5bf90eeca..53875370ae 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -183,9 +183,7 @@ $result_sectioning{'shortcontents_no_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 1,
@@ -194,18 +192,14 @@ $result_sectioning{'shortcontents_no_top'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '2.1',
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index 6a9d3db68a..161cffec7d 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2092,8 +2092,7 @@ $result_sectioning{'simple_menu'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -2121,20 +2120,10 @@ $result_nodes{'simple_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2154,8 +2143,7 @@ $result_nodes{'simple_menu'}{'structure'}{'node_next'} = 
$result_nodes{'simple_m
 $result_menus{'simple_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 71a45843f4..9c595b3dd4 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -555,12 +555,10 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -571,12 +569,10 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -603,9 +599,7 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -613,20 +607,10 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -634,16 +618,13 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -660,15 +641,13 @@ 
$result_nodes{'test_xrefautomaticsectiontitle'}{'structure'}{'node_next'} = $res
 $result_menus{'test_xrefautomaticsectiontitle'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'menu_up' => {},
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 38205db5a5..a5ef5586fe 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -565,12 +565,10 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -581,12 +579,10 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -613,9 +609,7 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -623,20 +617,10 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -644,16 +628,13 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} 
= {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -670,15 +651,13 @@ 
$result_nodes{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'node_nex
 $result_menus{'test_xrefautomaticsectiontitle_off_first'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'menu_up' => {},
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index f248ba4ebb..0e8b79177c 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -256,20 +256,16 @@ 
$result_sectioning{'text_before_top_and_contents_after_title'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -295,23 +291,19 @@ $result_nodes{'text_before_top_and_contents_after_title'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'text_before_top_and_contents_after_title'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index bd72d9cbe3..2b1d74b36c 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -256,20 +256,16 @@ 
$result_sectioning{'text_before_top_and_summarycontents_after_title'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -295,23 +291,19 @@ 
$result_nodes{'text_before_top_and_summarycontents_after_title'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'text_before_top_and_summarycontents_after_title'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 2e6db610f9..2a49ac2592 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -363,11 +363,9 @@ $result_sectioning{'titles'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -384,23 +382,19 @@ $result_nodes{'titles'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'titles'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 9be14a2d8b..fd5879138d 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -3461,12 +3461,10 @@ $result_sectioning{'htmlxref'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3477,12 +3475,10 @@ $result_sectioning{'htmlxref'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3509,9 +3505,7 @@ $result_nodes{'htmlxref'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3519,20 +3513,10 @@ $result_nodes{'htmlxref'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3540,9 +3524,7 @@ $result_nodes{'htmlxref'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3551,41 +3533,28 @@ $result_nodes{'htmlxref'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3622,36 +3591,31 @@ $result_nodes{'htmlxref'}{'structure'}{'node_next'} = 
$result_nodes{'htmlxref'}{
 $result_menus{'htmlxref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 5eb078ff95..bc71fef5fe 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -3461,12 +3461,10 @@ $result_sectioning{'htmlxref_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3477,12 +3475,10 @@ $result_sectioning{'htmlxref_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3509,9 +3505,7 @@ $result_nodes{'htmlxref_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3519,20 +3513,10 @@ $result_nodes{'htmlxref_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3540,9 +3524,7 @@ $result_nodes{'htmlxref_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3551,41 +3533,28 @@ $result_nodes{'htmlxref_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3622,36 +3591,31 @@ 
$result_nodes{'htmlxref_nodes'}{'structure'}{'node_next'} = $result_nodes{'htmlx
 $result_menus{'htmlxref_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 14dfba877c..89f8981ff3 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -3461,12 +3461,10 @@ $result_sectioning{'htmlxref_only_mono'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3477,12 +3475,10 @@ $result_sectioning{'htmlxref_only_mono'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3509,9 +3505,7 @@ $result_nodes{'htmlxref_only_mono'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3519,20 +3513,10 @@ $result_nodes{'htmlxref_only_mono'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3540,9 +3524,7 @@ $result_nodes{'htmlxref_only_mono'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3551,41 +3533,28 @@ $result_nodes{'htmlxref_only_mono'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3622,36 +3591,31 @@ 
$result_nodes{'htmlxref_only_mono'}{'structure'}{'node_next'} = $result_nodes{'h
 $result_menus{'htmlxref_only_mono'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index ca86e86166..9939bae0cb 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -3461,12 +3461,10 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3477,12 +3475,10 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3509,9 +3505,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3519,20 +3513,10 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3540,9 +3524,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3551,41 +3533,28 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3622,36 +3591,31 @@ 
$result_nodes{'htmlxref_only_mono_nodes'}{'structure'}{'node_next'} = $result_no
 $result_menus{'htmlxref_only_mono_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index e19f936d09..557dc2071c 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -3461,12 +3461,10 @@ $result_sectioning{'htmlxref_only_split'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3477,12 +3475,10 @@ $result_sectioning{'htmlxref_only_split'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3509,9 +3505,7 @@ $result_nodes{'htmlxref_only_split'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3519,20 +3513,10 @@ $result_nodes{'htmlxref_only_split'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3540,9 +3524,7 @@ $result_nodes{'htmlxref_only_split'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3551,41 +3533,28 @@ $result_nodes{'htmlxref_only_split'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3622,36 +3591,31 @@ 
$result_nodes{'htmlxref_only_split'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'htmlxref_only_split'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index d98477e517..ad54e75afa 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -3461,12 +3461,10 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3477,12 +3475,10 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3509,9 +3505,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3519,20 +3513,10 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3540,9 +3524,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3551,41 +3533,28 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3622,36 +3591,31 @@ 
$result_nodes{'htmlxref_only_split_nodes'}{'structure'}{'node_next'} = $result_n
 $result_menus{'htmlxref_only_split_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 2459555031..1b72cb0a7f 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -913,8 +913,7 @@ after verb
 $result_nodes{'cpp_lines'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -922,8 +921,7 @@ $result_nodes{'cpp_lines'} = {
 $result_menus{'cpp_lines'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 46e21088e2..48d71cb9a1 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -539,12 +539,10 @@ 
$result_sectioning{'macro_and_commands_in_early_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -561,15 +559,12 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -577,8 +572,7 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
 $result_menus{'macro_and_commands_in_early_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index acf8a25cad..b7ab6de1f7 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -634,12 +634,10 @@ $result_sectioning{'macro_in_early_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -656,15 +654,12 @@ $result_nodes{'macro_in_early_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -672,8 +667,7 @@ $result_nodes{'macro_in_early_commands'} = {
 $result_menus{'macro_in_early_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index c8910100f5..af17d8b66e 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -581,8 +581,7 @@ test_var verbatiminclude: ';
 $result_nodes{'value_expansion_in_include'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -590,8 +589,7 @@ $result_nodes{'value_expansion_in_include'} = {
 $result_menus{'value_expansion_in_include'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index 1a2e39a5c2..840b8520af 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -1092,8 +1092,7 @@ $result_nodes{'complex_recursive_synindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -1102,8 +1101,7 @@ $result_menus{'complex_recursive_synindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 5e6144d07b..339e9d1e15 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -1690,12 +1690,10 @@ $result_sectioning{'def_syn_indices'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1707,12 +1705,10 @@ $result_sectioning{'def_syn_indices'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'Chapter-index',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chapter-index'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1739,15 +1735,12 @@ $result_nodes{'def_syn_indices'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -1755,17 +1748,14 @@ $result_nodes{'def_syn_indices'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'Chapter-index',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chapter-index'
       },
       'structure' => {
         'node_prev' => {},
@@ -1780,8 +1770,7 @@ 
$result_nodes{'def_syn_indices'}{'structure'}{'node_next'}{'structure'}{'node_up
 $result_menus{'def_syn_indices'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index cac197ef32..1c3a2d150f 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -271,8 +271,7 @@ 
$result_nodes{'default_cp_index_and_one_letter_syncodeindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -280,8 +279,7 @@ 
$result_menus{'default_cp_index_and_one_letter_syncodeindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 299ae4ca11..f7a2778f68 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -549,28 +549,17 @@ $result_nodes{'double_index_entry'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'other-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -587,16 +576,14 @@ 
$result_nodes{'double_index_entry'}{'structure'}{'node_next'} = $result_nodes{'d
 $result_menus{'double_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'other-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 172848a003..0797666564 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -778,12 +778,10 @@ $result_sectioning{'double_seeentry_seealso'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -795,12 +793,10 @@ $result_sectioning{'double_seeentry_seealso'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'node-index',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node-index'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -827,15 +823,12 @@ $result_nodes{'double_seeentry_seealso'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -843,17 +836,14 @@ $result_nodes{'double_seeentry_seealso'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'node-index',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-index'
       },
       'structure' => {
         'node_prev' => {},
@@ -868,8 +858,7 @@ 
$result_nodes{'double_seeentry_seealso'}{'structure'}{'node_next'}{'structure'}{
 $result_menus{'double_seeentry_seealso'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 61f251dbc6..0307d66201 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -343,8 +343,7 @@ $result_nodes{'double_syncodeindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -352,8 +351,7 @@ $result_menus{'double_syncodeindex'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 5473e001de..5647298fa8 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -99,16 +99,14 @@ $result_texts{'empty_cindex_entry'} = '';
 $result_nodes{'empty_cindex_entry'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'empty_cindex_entry'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 7c86740658..9fe131da48 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -258,8 +258,7 @@ $result_nodes{'empty_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -267,8 +266,7 @@ $result_menus{'empty_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 345c9751a6..000612e324 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -748,8 +748,7 @@ $result_nodes{'empty_string_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -757,8 +756,7 @@ $result_menus{'empty_string_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index ebc1d67e5d..995fa9e1e1 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -3545,11 +3545,9 @@ $result_sectioning{'encoding_index_ascii'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3566,16 +3564,13 @@ $result_nodes{'encoding_index_ascii'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3583,8 +3578,7 @@ $result_menus{'encoding_index_ascii'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index b8f800ac92..2157a94c0f 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -3545,11 +3545,9 @@ 
$result_sectioning{'encoding_index_ascii_enable_encoding'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3566,16 +3564,13 @@ $result_nodes{'encoding_index_ascii_enable_encoding'} = 
{
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3583,8 +3578,7 @@ $result_menus{'encoding_index_ascii_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index efb920f0db..49886ef9b4 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -3523,11 +3523,9 @@ $result_sectioning{'encoding_index_latin1'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3544,16 +3542,13 @@ $result_nodes{'encoding_index_latin1'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3561,8 +3556,7 @@ $result_menus{'encoding_index_latin1'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index c115b340ef..7cb5538bb4 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -3523,11 +3523,9 @@ 
$result_sectioning{'encoding_index_latin1_enable_encoding'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3544,16 +3542,13 @@ $result_nodes{'encoding_index_latin1_enable_encoding'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3561,8 +3556,7 @@ $result_menus{'encoding_index_latin1_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index a133ae6e6d..e79a82c88d 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -3523,11 +3523,9 @@ $result_sectioning{'encoding_index_utf8'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3544,16 +3542,13 @@ $result_nodes{'encoding_index_utf8'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3561,8 +3556,7 @@ $result_menus{'encoding_index_utf8'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index df8afbab9f..f9d1eac553 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -3523,11 +3523,9 @@ 
$result_sectioning{'encoding_index_utf8_enable_encoding'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3544,16 +3542,13 @@ $result_nodes{'encoding_index_utf8_enable_encoding'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -3561,8 +3556,7 @@ $result_menus{'encoding_index_utf8_enable_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 81a6ce75da..abc85dfc25 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -809,8 +809,7 @@ $result_sectioning{'explicit_sort_key'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
           }
         },
@@ -835,8 +834,7 @@ $result_nodes{'explicit_sort_key'} = {
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -844,8 +842,7 @@ $result_menus{'explicit_sort_key'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index 8e9779bd15..7f4f3354d5 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -829,8 +829,7 @@ $result_nodes{'ftable_vtable'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -838,8 +837,7 @@ $result_menus{'ftable_vtable'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index e085a779b6..66619477ae 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -222,8 +222,7 @@ $result_nodes{'image_lines_count'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -231,8 +230,7 @@ $result_menus{'image_lines_count'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index d4dd52d273..806ba57001 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -222,8 +222,7 @@ $result_nodes{'image_text_lines_count'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -231,8 +230,7 @@ $result_menus{'image_text_lines_count'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index ec0741808a..60d5d7553d 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -462,8 +462,7 @@ $result_nodes{'index_entries_locations'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -471,8 +470,7 @@ $result_menus{'index_entries_locations'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 6481b94242..30c151f249 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 19973c7c25..17f2ae8b54 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -616,35 +616,23 @@ $result_nodes{'index_entry_before_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'node_prev' => {},
@@ -667,23 +655,20 @@ 
$result_nodes{'index_entry_before_node'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'index_entry_before_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index 59cd056117..ecc7a23e4c 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -231,8 +231,7 @@ $result_nodes{'index_entry_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -240,8 +239,7 @@ $result_menus{'index_entry_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 84a9861937..175e4296f4 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
@@ -531,28 +531,17 @@ 
$result_nodes{'index_entry_in_footnote_different_node_end'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'First',
-        'spaces_before_argument' => ' '
+        'normalized' => 'First'
       },
       'structure' => {
         'node_prev' => {},
@@ -569,16 +558,14 @@ 
$result_nodes{'index_entry_in_footnote_different_node_end'}{'structure'}{'node_n
 $result_menus{'index_entry_in_footnote_different_node_end'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'First',
-        'spaces_before_argument' => ' '
+        'normalized' => 'First'
       },
       'structure' => {
         'menu_up' => {},
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 355d58c6fd..3ecb2c5a6f 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -567,28 +567,17 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'First',
-        'spaces_before_argument' => ' '
+        'normalized' => 'First'
       },
       'structure' => {
         'node_prev' => {},
@@ -605,16 +594,14 @@ 
$result_nodes{'index_entry_in_footnote_separate'}{'structure'}{'node_next'} = $r
 $result_menus{'index_entry_in_footnote_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'First',
-        'spaces_before_argument' => ' '
+        'normalized' => 'First'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index dd70c95ae2..bd6e44b958 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -142,8 +142,7 @@ $result_nodes{'print_merged_index'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -152,8 +151,7 @@ $result_menus{'print_merged_index'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 019badce83..1604ce34d3 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -1151,12 +1151,10 @@ $result_sectioning{'printindex_index_entry_in_copying'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1168,12 +1166,10 @@ $result_sectioning{'printindex_index_entry_in_copying'} 
= {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1200,9 +1196,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1210,20 +1204,10 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1231,17 +1215,14 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1258,16 +1239,14 @@ 
$result_nodes{'printindex_index_entry_in_copying'}{'structure'}{'node_next'} = $
 $result_menus{'printindex_index_entry_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
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 dd9ba6efaf..f0282c46b9 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
@@ -675,12 +675,10 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -691,12 +689,10 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -723,9 +719,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -733,20 +727,10 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -754,16 +738,13 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -780,15 +761,13 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'nod
 $result_menus{'printindex_index_entry_in_copying_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
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 d952d390b3..7e40a2d881 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
@@ -1111,12 +1111,10 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1128,12 +1126,10 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1160,9 +1156,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1170,20 +1164,10 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1191,17 +1175,14 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1218,16 +1199,14 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}
 $result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index cc1a42e50b..a80a128575 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index bedbc8539d..2e1877cd05 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -601,8 +601,7 @@ $result_sectioning{'same_index_entry_merged_indices'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
           }
         },
@@ -627,8 +626,7 @@ $result_nodes{'same_index_entry_merged_indices'} = {
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -636,8 +634,7 @@ $result_menus{'same_index_entry_merged_indices'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index e32ad11723..bc109f6e31 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -390,8 +390,7 @@ $result_nodes{'seealso_duplicate'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -399,8 +398,7 @@ $result_menus{'seealso_duplicate'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 9eabefc99a..8fe5f58399 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -662,8 +662,7 @@ $result_sectioning{'seeentry'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -678,12 +677,10 @@ $result_sectioning{'seeentry'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter-index',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-index'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -715,8 +712,7 @@ $result_nodes{'seeentry'} = {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -724,17 +720,14 @@ $result_nodes{'seeentry'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter-index',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-index'
       },
       'structure' => {
         'node_prev' => {},
@@ -749,8 +742,7 @@ 
$result_nodes{'seeentry'}{'structure'}{'node_next'}{'structure'}{'node_up'} = $r
 $result_menus{'seeentry'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index fd48dbe419..15a2d9397b 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1126,8 +1126,7 @@ $result_sectioning{'subentries'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -1142,12 +1141,10 @@ $result_sectioning{'subentries'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter-index',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-index'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1179,8 +1176,7 @@ $result_nodes{'subentries'} = {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -1188,17 +1184,14 @@ $result_nodes{'subentries'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter-index',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-index'
       },
       'structure' => {
         'node_prev' => {},
@@ -1213,8 +1206,7 @@ 
$result_nodes{'subentries'}{'structure'}{'node_next'}{'structure'}{'node_up'} =
 $result_menus{'subentries'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index daac29604a..985f4809cc 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -632,8 +632,7 @@ $result_sectioning{'subentry_and_sortas'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -648,12 +647,10 @@ $result_sectioning{'subentry_and_sortas'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter-index',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-index'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -685,8 +682,7 @@ $result_nodes{'subentry_and_sortas'} = {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -694,17 +690,14 @@ $result_nodes{'subentry_and_sortas'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter-index',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-index'
       },
       'structure' => {
         'node_prev' => {},
@@ -719,8 +712,7 @@ 
$result_nodes{'subentry_and_sortas'}{'structure'}{'node_next'}{'structure'}{'nod
 $result_menus{'subentry_and_sortas'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 4f0a9beb44..4160ba3154 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -557,12 +557,10 @@ $result_sectioning{'syncode_index_print_both'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -574,12 +572,10 @@ $result_sectioning{'syncode_index_print_both'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter-index',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-index'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -606,15 +602,12 @@ $result_nodes{'syncode_index_print_both'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -622,17 +615,14 @@ $result_nodes{'syncode_index_print_both'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter-index',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-index'
       },
       'structure' => {
         'node_prev' => {},
@@ -647,8 +637,7 @@ 
$result_nodes{'syncode_index_print_both'}{'structure'}{'node_next'}{'structure'}
 $result_menus{'syncode_index_print_both'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index fcf500f7c2..a2b2be3754 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -395,8 +395,7 @@ $result_nodes{'syncodeindex_to_plain'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -404,8 +403,7 @@ $result_menus{'syncodeindex_to_plain'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 8b4b1f6356..d35dd723ba 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -401,8 +401,7 @@ $result_sectioning{'transparent_sort_chars'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
           }
         },
@@ -427,8 +426,7 @@ $result_nodes{'transparent_sort_chars'} = {
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -436,8 +434,7 @@ $result_menus{'transparent_sort_chars'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 34a510267e..5ce5da6b65 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -356,8 +356,7 @@ $result_sectioning{'w_lines_count'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
           }
         },
@@ -382,8 +381,7 @@ $result_nodes{'w_lines_count'} = {
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -391,8 +389,7 @@ $result_menus{'w_lines_count'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index 589a437c90..ef5d9ec4ea 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -277,11 +277,9 @@ $result_sectioning{'anchor_and_spaces'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -298,23 +296,19 @@ $result_nodes{'anchor_and_spaces'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_and_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index 6207f5423e..c891d57456 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -262,16 +262,14 @@ emph emph2 .
 $result_nodes{'anchor_in_command'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_in_command'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 946310e3b2..98f9d78c51 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -880,12 +880,10 @@ $result_sectioning{'before_node_and_section'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -897,12 +895,10 @@ $result_sectioning{'before_node_and_section'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'node1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -929,9 +925,7 @@ $result_nodes{'before_node_and_section'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -939,20 +933,10 @@ $result_nodes{'before_node_and_section'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -960,17 +944,14 @@ $result_nodes{'before_node_and_section'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'node1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node1'
       },
       'structure' => {
         'node_prev' => {},
@@ -987,16 +968,14 @@ 
$result_nodes{'before_node_and_section'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'before_node_and_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'node1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node1'
       },
       'structure' => {
         'menu_up' => {},
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 8b28c4bc16..76be156607 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -740,8 +740,7 @@ $result_nodes{'colon_in_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -749,8 +748,7 @@ $result_menus{'colon_in_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index aaa6dc7c4d..bcb5a5790e 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -910,11 +910,9 @@ $result_sectioning{'def_in_copying'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -931,16 +929,13 @@ $result_nodes{'def_in_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -948,8 +943,7 @@ $result_menus{'def_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 cd476ac178..8ca5487e49 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -629,11 +629,9 @@ $result_sectioning{'direntry_dircategory_and_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -650,23 +648,19 @@ $result_nodes{'direntry_dircategory_and_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'direntry_dircategory_and_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index 7730a2846a..3f855dd7e4 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -136,16 +136,14 @@ $result_texts{'encoding_us_ascii'} = '
 $result_nodes{'encoding_us_ascii'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'encoding_us_ascii'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 4409aabc2a..69161d668a 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -503,16 +503,14 @@ Float text1
 $result_nodes{'error_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'error_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -549,16 +547,7 @@ $result_floats{'error_in_footnote'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 53d0c473ee..bfc450c4c8 100644
Binary files a/tp/t/results/info_tests/file_only_png.pl and 
b/tp/t/results/info_tests/file_only_png.pl differ
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index d4d885e854..beda42c9df 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -423,16 +423,14 @@ Text, text2
 $result_nodes{'float_long_captions'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'float_long_captions'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -450,16 +448,7 @@ $result_floats{'float_long_captions'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'text1',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -482,16 +471,7 @@ $result_floats{'float_long_captions'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'text2',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index fe233a0496..de10514a4b 100644
--- a/tp/t/results/info_tests/image_and_punctuation.pl
+++ b/tp/t/results/info_tests/image_and_punctuation.pl
@@ -421,16 +421,14 @@ words.
 $result_nodes{'image_and_punctuation'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'image_and_punctuation'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl 
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 9a9d4ace99..2aac61352c 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -1039,16 +1039,14 @@ Text. words       words.
 $result_nodes{'image_and_spaces_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'image_and_spaces_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index f11a730027..201af55138 100644
--- a/tp/t/results/info_tests/image_extension.pl
+++ b/tp/t/results/info_tests/image_extension.pl
@@ -280,16 +280,14 @@ f--ile
 $result_nodes{'image_extension'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'image_extension'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/image_in_paragraph.pl 
b/tp/t/results/info_tests/image_in_paragraph.pl
index 1300470b54..101f1e9fbb 100644
Binary files a/tp/t/results/info_tests/image_in_paragraph.pl and 
b/tp/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tp/t/results/info_tests/image_not_found.pl 
b/tp/t/results/info_tests/image_not_found.pl
index 2d8ae8807f..bf73db5bcf 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -109,16 +109,14 @@ $result_texts{'image_not_found'} = 'n_f_image
 $result_nodes{'image_not_found'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'image_not_found'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 5fb4dae2de..070a7d53c8 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index 38ba276a15..d68f4e3f19 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
@@ -638,12 +638,10 @@ $result_sectioning{'index_entry_at_end_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -654,12 +652,10 @@ $result_sectioning{'index_entry_at_end_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -676,12 +672,10 @@ $result_sectioning{'index_entry_at_end_node'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'indices',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'indices'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -713,9 +707,7 @@ $result_nodes{'index_entry_at_end_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -723,20 +715,10 @@ $result_nodes{'index_entry_at_end_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -744,16 +726,13 @@ $result_nodes{'index_entry_at_end_node'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_next' => {
@@ -761,17 +740,14 @@ $result_nodes{'index_entry_at_end_node'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'appendix',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 'A'
               }
             },
             'isindex' => 1,
-            'normalized' => 'indices',
-            'spaces_before_argument' => ' '
+            'normalized' => 'indices'
           },
           'structure' => {
             'node_prev' => {},
@@ -794,23 +770,20 @@ 
$result_nodes{'index_entry_at_end_node'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'index_entry_at_end_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'indices',
-            'spaces_before_argument' => ' '
+            'normalized' => 'indices'
           },
           'structure' => {
             'menu_prev' => {},
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 2b9d095035..79e0b74f3f 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
@@ -994,41 +994,28 @@ $result_nodes{'invalid_node_name_no_warning'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nodename_002e-a',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nodename_002e-a'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node_002ccomma',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node_002ccomma'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'bidule_003a',
-                'spaces_before_argument' => ' '
+                'normalized' => 'bidule_003a'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1057,29 +1044,25 @@ 
$result_nodes{'invalid_node_name_no_warning'}{'structure'}{'node_next'} = $resul
 $result_menus{'invalid_node_name_no_warning'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nodename_002e-a',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nodename_002e-a'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node_002ccomma',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node_002ccomma'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'bidule_003a',
-                'spaces_before_argument' => ' '
+                'normalized' => 'bidule_003a'
               },
               'structure' => {
                 'menu_prev' => {},
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 501aa10512..3c0cd34f00 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -994,41 +994,28 @@ $result_nodes{'invalid_node_name_warning'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nodename_002e-a',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nodename_002e-a'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node_002ccomma',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node_002ccomma'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'bidule_003a',
-                'spaces_before_argument' => ' '
+                'normalized' => 'bidule_003a'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1057,29 +1044,25 @@ 
$result_nodes{'invalid_node_name_warning'}{'structure'}{'node_next'} = $result_n
 $result_menus{'invalid_node_name_warning'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nodename_002e-a',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nodename_002e-a'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node_002ccomma',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node_002ccomma'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'bidule_003a',
-                'spaces_before_argument' => ' '
+                'normalized' => 'bidule_003a'
               },
               'structure' => {
                 'menu_prev' => {},
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index 3f5eb5c2a7..62a742005f 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -136,16 +136,14 @@ $result_texts{'known_encoding'} = '
 $result_nodes{'known_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'known_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 74d755245c..5e9309b572 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
@@ -1181,8 +1181,7 @@ $result_nodes{'multitable_anchor_and_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -1190,8 +1189,7 @@ $result_menus{'multitable_anchor_and_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 6606e89175..a8f6f94cc9 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -231,16 +231,14 @@ F
 $result_nodes{'nested_footnotes_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'nested_footnotes_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 cd503fbfed..e349523afa 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -852,8 +852,7 @@ $result_nodes{'nested_multitable_anchor_index'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -861,8 +860,7 @@ $result_menus{'nested_multitable_anchor_index'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/no_node_but_top.pl 
b/tp/t/results/info_tests/no_node_but_top.pl
index d5d079d1f5..570dd91856 100644
--- a/tp/t/results/info_tests/no_node_but_top.pl
+++ b/tp/t/results/info_tests/no_node_but_top.pl
@@ -63,9 +63,7 @@ $result_sectioning{'no_node_but_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index a4993cf068..4fbdbb3874 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -72,16 +72,14 @@ $result_texts{'no_top_node'} = '';
 $result_nodes{'no_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'node-Top-not-Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node-Top-not-Top-node'
   }
 };
 
 $result_menus{'no_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'node-Top-not-Top-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node-Top-not-Top-node'
   }
 };
 
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index 9a5f504ba4..2729c9e2bf 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -415,16 +415,14 @@ $result_texts{'note_in_strong'} = '
 $result_nodes{'note_in_strong'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'note_in_strong'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index 940e34930c..9b72d6873f 100644
--- a/tp/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -189,16 +189,14 @@ a
 $result_nodes{'note_in_strong_end_of_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'note_in_strong_end_of_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index 0d10462935..91d0fc8f17 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -384,16 +384,14 @@ $result_texts{'novalidate_empty_refs'} = '
 $result_nodes{'novalidate_empty_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'novalidate_empty_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 2ad4173bc0..70498cc5cd 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -373,11 +373,9 @@ $result_sectioning{'paragraphindent_and_preamble'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -394,23 +392,19 @@ $result_nodes{'paragraphindent_and_preamble'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'paragraphindent_and_preamble'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index ec211efa7f..92ac4e4676 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -378,16 +378,14 @@ Hey ((m) in pxref) and continue ((m) in pxref) and end.
 $result_nodes{'pxref_test'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'pxref_test'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 537b5a854c..c90ec5af50 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -653,16 +653,14 @@ $result_texts{'ref_tests'} = '
 $result_nodes{'ref_tests'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'ref_tests'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/space_at_menu_end.pl 
b/tp/t/results/info_tests/space_at_menu_end.pl
index e19061fa5d..ef71832841 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -272,20 +272,10 @@ $result_nodes{'space_at_menu_end'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -305,8 +295,7 @@ 
$result_nodes{'space_at_menu_end'}{'structure'}{'node_next'} = $result_nodes{'sp
 $result_menus{'space_at_menu_end'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index cc1b5cee40..c880e03ba1 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -395,12 +395,10 @@ $result_sectioning{'space_in_menu'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -411,12 +409,10 @@ $result_sectioning{'space_in_menu'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -443,9 +439,7 @@ $result_nodes{'space_in_menu'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -453,20 +447,10 @@ $result_nodes{'space_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -474,16 +458,13 @@ $result_nodes{'space_in_menu'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'node_prev' => {},
@@ -500,15 +481,13 @@ $result_nodes{'space_in_menu'}{'structure'}{'node_next'} 
= $result_nodes{'space_
 $result_menus{'space_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index 929f8ba7ab..da444cca39 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -149,16 +149,14 @@ $result_texts{'space_in_setfilename'} = '
 $result_nodes{'space_in_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'space_in_setfilename'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 2b1c464fe3..568d17309f 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -477,12 +477,10 @@ $result_sectioning{'split_no_copying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -493,12 +491,10 @@ $result_sectioning{'split_no_copying'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Ch1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Ch1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -525,9 +521,7 @@ $result_nodes{'split_no_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -535,20 +529,10 @@ $result_nodes{'split_no_copying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -556,16 +540,13 @@ $result_nodes{'split_no_copying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Ch1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Ch1'
       },
       'structure' => {
         'node_prev' => {},
@@ -582,15 +563,13 @@ 
$result_nodes{'split_no_copying'}{'structure'}{'node_next'} = $result_nodes{'spl
 $result_menus{'split_no_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Ch1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Ch1'
       },
       'structure' => {
         'menu_up' => {},
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 74fb75f587..3b9da78675 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
@@ -471,12 +471,10 @@ $result_sectioning{'split_test_before_first_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -487,12 +485,10 @@ $result_sectioning{'split_test_before_first_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -519,9 +515,7 @@ $result_nodes{'split_test_before_first_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -529,20 +523,10 @@ $result_nodes{'split_test_before_first_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -550,16 +534,13 @@ $result_nodes{'split_test_before_first_node'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap1'
       },
       'structure' => {
         'node_prev' => {},
@@ -576,15 +557,13 @@ 
$result_nodes{'split_test_before_first_node'}{'structure'}{'node_next'} = $resul
 $result_menus{'split_test_before_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chap1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap1'
       },
       'structure' => {
         'menu_up' => {},
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 dba540afa8..9f0f2af2cf 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
@@ -462,12 +462,10 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -478,12 +476,10 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -510,9 +506,7 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -520,20 +514,10 @@ 
$result_nodes{'split_test_before_first_node_no_empty_line'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -541,16 +525,13 @@ 
$result_nodes{'split_test_before_first_node_no_empty_line'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap1'
       },
       'structure' => {
         'node_prev' => {},
@@ -567,15 +548,13 @@ 
$result_nodes{'split_test_before_first_node_no_empty_line'}{'structure'}{'node_n
 $result_menus{'split_test_before_first_node_no_empty_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chap1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap1'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 591bd2dd06..c7e9e89e25 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -4323,12 +4323,10 @@ $result_sectioning{'test_index'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -4339,12 +4337,10 @@ $result_sectioning{'test_index'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'name',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'name'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4361,12 +4357,10 @@ $result_sectioning{'test_index'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4374,27 +4368,21 @@ $result_sectioning{'test_index'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'appendixsec',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => 'A.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'appendixsubsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => 'A.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'appendixsubsubsec',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => 'A.1.1.1',
@@ -4418,9 +4406,7 @@ $result_sectioning{'test_index'} = {
             },
             {
               'cmdname' => 'centerchap',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -4431,9 +4417,7 @@ $result_sectioning{'test_index'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 'B',
@@ -4475,9 +4459,7 @@ $result_nodes{'test_index'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -4485,20 +4467,10 @@ $result_nodes{'test_index'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -4506,16 +4478,13 @@ $result_nodes{'test_index'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'name',
-        'spaces_before_argument' => ' '
+        'normalized' => 'name'
       },
       'structure' => {
         'node_next' => {
@@ -4523,17 +4492,14 @@ $result_nodes{'test_index'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'appendix',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 'A'
               }
             },
             'isindex' => 1,
-            'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
           },
           'structure' => {
             'node_prev' => {},
@@ -4556,23 +4522,20 @@ $result_nodes{'test_index'}{'structure'}{'node_next'} = 
$result_nodes{'test_inde
 $result_menus{'test_index'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'name',
-        'spaces_before_argument' => ' '
+        'normalized' => 'name'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index 2d2aa3fa25..bafb167ed5 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -356,12 +356,10 @@ $result_sectioning{'text_before_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -372,12 +370,10 @@ $result_sectioning{'text_before_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -404,9 +400,7 @@ $result_nodes{'text_before_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -414,20 +408,10 @@ $result_nodes{'text_before_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -435,16 +419,13 @@ $result_nodes{'text_before_node'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -461,15 +442,13 @@ 
$result_nodes{'text_before_node'}{'structure'}{'node_next'} = $result_nodes{'tex
 $result_menus{'text_before_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 022c2ccaef..5f3e164d5d 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -317,20 +317,10 @@ $result_nodes{'top_node_normalization'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
@@ -345,8 +335,7 @@ 
$result_nodes{'top_node_normalization'}{'structure'}{'node_prev'} = $result_node
 $result_menus{'top_node_normalization'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index a7e6f0f235..f7fe187897 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -134,16 +134,14 @@ $result_texts{'unknown_encoding'} = '
 $result_nodes{'unknown_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'unknown_encoding'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index 70ab5ad37a..49dd1f429e 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -431,16 +431,14 @@ $result_texts{'xref_test'} = '
 $result_nodes{'xref_test'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'xref_test'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 51c6b1aaf2..eff2aa4f35 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -257,16 +257,7 @@ $result_floats{'float_in_style_command'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'B',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index 528a89e279..a420ffde97 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -188,8 +188,7 @@ Top';
 $result_nodes{'footnote_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -197,8 +196,7 @@ $result_nodes{'footnote_in_ref'} = {
 $result_menus{'footnote_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 8194f66a0b..9dd1839f38 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -191,8 +191,7 @@ Top.
 $result_nodes{'ignore_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -200,8 +199,7 @@ $result_nodes{'ignore_in_xref'} = {
 $result_menus{'ignore_in_xref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index dcaf3495e5..00df37ade4 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -1260,8 +1260,7 @@ $result_nodes{'in_table'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -1270,8 +1269,7 @@ $result_menus{'in_table'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 dbc72b6ba8..4e973eb98f 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -260,20 +260,10 @@ $result_nodes{'menu_in_style_command'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -293,8 +283,7 @@ 
$result_nodes{'menu_in_style_command'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'menu_in_style_command'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl 
b/tp/t/results/invalid_nestings/node_in_copying.pl
index cf88138a40..ff531684ea 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -107,8 +107,7 @@ $result_texts{'node_in_copying'} = '
 $result_nodes{'node_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node'
   },
   'structure' => {}
 };
@@ -116,8 +115,7 @@ $result_nodes{'node_in_copying'} = {
 $result_menus{'node_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index 4b88fc2d6c..d1e26fb41a 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -207,12 +207,10 @@ $result_sectioning{'node_in_copying_not_closed'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -229,15 +227,12 @@ $result_nodes{'node_in_copying_not_closed'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -245,8 +240,7 @@ $result_nodes{'node_in_copying_not_closed'} = {
 $result_menus{'node_in_copying_not_closed'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index 899a6fead7..8a655e6b91 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -255,8 +255,7 @@ Content
 $result_nodes{'node_on_index_entry_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a'
   },
   'structure' => {
     'node_next' => {
@@ -295,8 +294,7 @@ $result_nodes{'node_on_index_entry_line'} = {
 $result_menus{'node_on_index_entry_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index d924660f2e..baeb974aed 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -335,8 +335,7 @@ $result_texts{'on_node_line'} = '';
 $result_nodes{'on_node_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a'
   },
   'structure' => {
     'node_next' => {
@@ -364,8 +363,7 @@ $result_nodes{'on_node_line'} = {
 $result_menus{'on_node_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 476590f784..353850f576 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -209,9 +209,7 @@ $result_sectioning{'on_section_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index ff04725014..38b0316b46 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -217,8 +217,7 @@ Topquotation in ref
 $result_nodes{'quotation_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -226,8 +225,7 @@ $result_nodes{'quotation_in_ref'} = {
 $result_menus{'quotation_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/ref_in_anchor.pl 
b/tp/t/results/invalid_nestings/ref_in_anchor.pl
index 670df56404..7d30d7a968 100644
--- a/tp/t/results/invalid_nestings/ref_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_in_anchor.pl
@@ -149,8 +149,7 @@ $result_texts{'ref_in_anchor'} = '';
 $result_nodes{'ref_in_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -158,8 +157,7 @@ $result_nodes{'ref_in_anchor'} = {
 $result_menus{'ref_in_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index e43be31aa6..850dcbe37d 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -147,8 +147,7 @@ $result_texts{'ref_in_ref'} = 'Top';
 $result_nodes{'ref_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -156,8 +155,7 @@ $result_nodes{'ref_in_ref'} = {
 $result_menus{'ref_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index 52059dcdff..b0498bb100 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -118,9 +118,7 @@ $result_sectioning{'section_in_copying'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index b4842cd535..99ba349ac3 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -121,9 +121,7 @@ $result_sectioning{'section_in_flushright'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index 02b5ee5968..e1deaa55b5 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -118,9 +118,7 @@ $result_sectioning{'section_in_footnote'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index 43001ddaa6..b307d9c29c 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -236,9 +236,7 @@ $result_sectioning{'section_in_math'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -247,9 +245,7 @@ $result_sectioning{'section_in_math'} = {
       },
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 2,
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index a9a95b28fe..a8f4392c38 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -242,9 +242,7 @@ $result_sectioning{'section_in_nested_block_commands'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 2e6811cee9..1e090c99d2 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -210,9 +210,7 @@ $result_sectioning{'section_in_table'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 0544649ee1..095be78b90 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -141,9 +141,7 @@ $result_sectioning{'section_on_def_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 5a697f1731..eb6786f4bb 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -261,9 +261,7 @@ $result_sectioning{'section_on_defx_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index f92f172def..7e6a3a3538 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -116,9 +116,7 @@ $result_sectioning{'section_on_index_entry_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl 
b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index 95a6dce379..f1424c4b71 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -133,8 +133,7 @@ In node
 $result_nodes{'style_not_closed_before_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -142,8 +141,7 @@ $result_nodes{'style_not_closed_before_first_node'} = {
 $result_menus{'style_not_closed_before_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 675c4da717..a54743bec2 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
@@ -441,12 +441,10 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -457,12 +455,10 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -489,9 +485,7 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -499,20 +493,10 @@ 
$result_nodes{'style_not_closed_no_newline_root_commands'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -520,16 +504,13 @@ 
$result_nodes{'style_not_closed_no_newline_root_commands'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -546,15 +527,13 @@ 
$result_nodes{'style_not_closed_no_newline_root_commands'}{'structure'}{'node_ne
 $result_menus{'style_not_closed_no_newline_root_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
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 197923c5f9..59edc1ee9e 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
@@ -459,12 +459,10 @@ $result_sectioning{'style_not_closed_root_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -475,12 +473,10 @@ $result_sectioning{'style_not_closed_root_commands'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -507,9 +503,7 @@ $result_nodes{'style_not_closed_root_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -517,20 +511,10 @@ $result_nodes{'style_not_closed_root_commands'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -538,16 +522,13 @@ $result_nodes{'style_not_closed_root_commands'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -564,15 +545,13 @@ 
$result_nodes{'style_not_closed_root_commands'}{'structure'}{'node_next'} = $res
 $result_menus{'style_not_closed_root_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index edf21f1b36..71f7853c34 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -107,9 +107,7 @@ $result_sectioning{'unclosed_verb_on_section_line'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 38596d0e03..d7a1b50cd5 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -186,8 +186,7 @@ Topverbat text
 $result_nodes{'verbatim_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -195,8 +194,7 @@ $result_nodes{'verbatim_in_ref'} = {
 $result_menus{'verbatim_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 01c19e19eb..a7829a819d 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -1364,12 +1364,10 @@ $result_sectioning{'inter_item_commands_in_enumerate'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1380,12 +1378,10 @@ $result_sectioning{'inter_item_commands_in_enumerate'} 
= {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1412,15 +1408,12 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -1428,16 +1421,13 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1452,8 +1442,7 @@ 
$result_nodes{'inter_item_commands_in_enumerate'}{'structure'}{'node_next'}{'str
 $result_menus{'inter_item_commands_in_enumerate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 5727d661fd..ea3f7daf01 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -916,12 +916,10 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -932,12 +930,10 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -964,15 +960,12 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -980,16 +973,13 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1004,8 +994,7 @@ 
$result_nodes{'inter_item_commands_in_itemize'}{'structure'}{'node_next'}{'struc
 $result_menus{'inter_item_commands_in_itemize'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 565ab9806f..be160d2d19 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -232,20 +232,16 @@ $result_sectioning{'appendix_translated'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'appendix',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 'A',
@@ -271,23 +267,19 @@ $result_nodes{'appendix_translated'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'appendix_translated'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index acbfb822fd..9376358107 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -220,11 +220,9 @@ $result_sectioning{'command_translated'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -241,23 +239,19 @@ $result_nodes{'command_translated'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'command_translated'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index a6f9a60c22..463ac25b5c 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -965,8 +965,7 @@ $result_nodes{'multiple'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -974,8 +973,7 @@ $result_menus{'multiple'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 2932216d67..197b55fddd 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -2074,12 +2074,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -2090,12 +2088,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-ja',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-ja'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2111,12 +2107,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-en',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-en'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2133,12 +2127,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-fr_005fFR',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-fr_005fFR'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2155,12 +2147,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2177,12 +2167,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-pt_005fBR',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-pt_005fBR'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2226,9 +2214,7 @@ $result_nodes{'multiple_lang_chapters'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -2236,20 +2222,10 @@ $result_nodes{'multiple_lang_chapters'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2257,16 +2233,13 @@ $result_nodes{'multiple_lang_chapters'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter-ja',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-ja'
       },
       'structure' => {
         'node_next' => {
@@ -2274,16 +2247,13 @@ $result_nodes{'multiple_lang_chapters'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'chapter-en',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-en'
           },
           'structure' => {
             'node_next' => {
@@ -2291,16 +2261,13 @@ $result_nodes{'multiple_lang_chapters'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => 'chapter-fr_005fFR',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-fr_005fFR'
               },
               'structure' => {
                 'node_next' => {
@@ -2308,16 +2275,13 @@ $result_nodes{'multiple_lang_chapters'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {
                     'node_next' => {
@@ -2325,16 +2289,13 @@ $result_nodes{'multiple_lang_chapters'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => 'chapter-pt_005fBR',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chapter-pt_005fBR'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -2375,43 +2336,37 @@ 
$result_nodes{'multiple_lang_chapters'}{'structure'}{'node_next'} = $result_node
 $result_menus{'multiple_lang_chapters'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-ja',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-ja'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-en',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-en'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter-fr_005fFR',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-fr_005fFR'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'chapter-pt_005fBR',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chapter-pt_005fBR'
                       },
                       'structure' => {
                         'menu_prev' => {},
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 8bf9585b1f..366cbab4a6 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -2074,12 +2074,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -2090,12 +2088,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-ja',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-ja'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2111,12 +2107,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-en',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-en'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2133,12 +2127,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-fr_005fFR',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-fr_005fFR'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2155,12 +2147,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2177,12 +2167,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-pt_005fBR',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-pt_005fBR'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2226,9 +2214,7 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -2236,20 +2222,10 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2257,16 +2233,13 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter-ja',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-ja'
       },
       'structure' => {
         'node_next' => {
@@ -2274,16 +2247,13 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'chapter-en',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-en'
           },
           'structure' => {
             'node_next' => {
@@ -2291,16 +2261,13 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => 'chapter-fr_005fFR',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-fr_005fFR'
               },
               'structure' => {
                 'node_next' => {
@@ -2308,16 +2275,13 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {
                     'node_next' => {
@@ -2325,16 +2289,13 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => 'chapter-pt_005fBR',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chapter-pt_005fBR'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -2375,43 +2336,37 @@ 
$result_nodes{'multiple_lang_chapters_latex'}{'structure'}{'node_next'} = $resul
 $result_menus{'multiple_lang_chapters_latex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-ja',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-ja'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-en',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-en'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter-fr_005fFR',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-fr_005fFR'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'chapter-pt_005fBR',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chapter-pt_005fBR'
                       },
                       'structure' => {
                         'menu_prev' => {},
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 09c4a428cd..eff231376c 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -2041,12 +2041,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -2057,12 +2055,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-ja',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-ja'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2078,12 +2074,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-en',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-en'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2100,12 +2094,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-fr_005fFR',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-fr_005fFR'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2122,12 +2114,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2144,12 +2134,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-pt_005fBR',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-pt_005fBR'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2193,9 +2181,7 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -2203,20 +2189,10 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2224,16 +2200,13 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter-ja',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-ja'
       },
       'structure' => {
         'node_next' => {
@@ -2241,16 +2214,13 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'chapter-en',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-en'
           },
           'structure' => {
             'node_next' => {
@@ -2258,16 +2228,13 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => 'chapter-fr_005fFR',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-fr_005fFR'
               },
               'structure' => {
                 'node_next' => {
@@ -2275,16 +2242,13 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {
                     'node_next' => {
@@ -2292,16 +2256,13 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1,
                             'number' => 5
                           }
                         },
-                        'normalized' => 'chapter-pt_005fBR',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chapter-pt_005fBR'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -2342,43 +2303,37 @@ 
$result_nodes{'multiple_lang_chapters_texi2html'}{'structure'}{'node_next'} = $r
 $result_menus{'multiple_lang_chapters_texi2html'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-ja',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-ja'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-en',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-en'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter-fr_005fFR',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-fr_005fFR'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-de',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-de'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'chapter-pt_005fBR',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'chapter-pt_005fBR'
                       },
                       'structure' => {
                         'menu_prev' => {},
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 5ebc8c7bcb..92a2b579eb 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -316,16 +316,14 @@ Instance Variable of AAA: BBB CCC
 $result_nodes{'simple'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'simple'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 2b1f4725d5..d2a1d76b5a 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -330,11 +330,9 @@ $result_sectioning{'unknown_language'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -351,23 +349,19 @@ $result_nodes{'unknown_language'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'unknown_language'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 0cc195bd31..206a7d8693 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -316,16 +316,14 @@ Instance Variable of AAA: BBB CCC
 $result_nodes{'unknown_region'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'unknown_region'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index 4e44b9f658..f0e80d714b 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -1074,12 +1074,10 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1090,12 +1088,10 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1122,15 +1118,12 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -1138,16 +1131,13 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -1162,8 +1152,7 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'}{'structure'}{'node_
 $result_menus{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 6140454c12..3f96f4e06b 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -945,12 +945,10 @@ $result_sectioning{'custom_headings'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -961,12 +959,10 @@ $result_sectioning{'custom_headings'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -974,9 +970,7 @@ $result_sectioning{'custom_headings'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
@@ -991,9 +985,7 @@ $result_sectioning{'custom_headings'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2,
@@ -1005,9 +997,7 @@ $result_sectioning{'custom_headings'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -1043,15 +1033,12 @@ $result_nodes{'custom_headings'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -1059,16 +1046,13 @@ $result_nodes{'custom_headings'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1083,8 +1067,7 @@ 
$result_nodes{'custom_headings'}{'structure'}{'node_next'}{'structure'}{'node_up
 $result_menus{'custom_headings'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index ca437287ef..253f7f950f 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -2236,12 +2236,10 @@ $result_sectioning{'float_and_refs'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -2252,12 +2250,10 @@ $result_sectioning{'float_and_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2269,9 +2265,7 @@ $result_sectioning{'float_and_refs'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2,
@@ -2283,9 +2277,7 @@ $result_sectioning{'float_and_refs'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -2320,15 +2312,12 @@ $result_nodes{'float_and_refs'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -2336,16 +2325,13 @@ $result_nodes{'float_and_refs'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -2360,8 +2346,7 @@ 
$result_nodes{'float_and_refs'}{'structure'}{'node_next'}{'structure'}{'node_up'
 $result_menus{'float_and_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -2380,19 +2365,9 @@ $result_floats{'float_and_refs'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -2405,7 +2380,6 @@ $result_floats{'float_and_refs'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
@@ -2425,14 +2399,6 @@ $result_floats{'float_and_refs'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'my-figure',
         'shortcaption' => {
@@ -2441,7 +2407,6 @@ $result_floats{'float_and_refs'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -2466,14 +2431,6 @@ $result_floats{'float_and_refs'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {},
         'normalized' => 'with-type',
         'shortcaption' => {
@@ -2482,7 +2439,6 @@ $result_floats{'float_and_refs'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 52a64b981e..0bbb26c303 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -707,12 +707,10 @@ $result_sectioning{'fonttextsize'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -723,12 +721,10 @@ $result_sectioning{'fonttextsize'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -736,18 +732,14 @@ $result_sectioning{'fonttextsize'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
@@ -756,9 +748,7 @@ $result_sectioning{'fonttextsize'} = {
                         },
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.2',
@@ -768,9 +758,7 @@ $result_sectioning{'fonttextsize'} = {
                         },
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.3',
@@ -780,9 +768,7 @@ $result_sectioning{'fonttextsize'} = {
                         },
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.4',
@@ -825,15 +811,12 @@ $result_nodes{'fonttextsize'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -841,16 +824,13 @@ $result_nodes{'fonttextsize'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -865,8 +845,7 @@ 
$result_nodes{'fonttextsize'}{'structure'}{'node_next'}{'structure'}{'node_up'}
 $result_menus{'fonttextsize'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 740a89499b..04fcf115ed 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1229,12 +1229,10 @@ $result_sectioning{'indices'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1246,12 +1244,10 @@ $result_sectioning{'indices'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1278,15 +1274,12 @@ $result_nodes{'indices'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -1294,17 +1287,14 @@ $result_nodes{'indices'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1319,8 +1309,7 @@ 
$result_nodes{'indices'}{'structure'}{'node_next'}{'structure'}{'node_up'} = $re
 $result_menus{'indices'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 7e16a18cbd..96383d2e14 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -459,12 +459,10 @@ $result_sectioning{'pagesizes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -475,12 +473,10 @@ $result_sectioning{'pagesizes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -492,9 +488,7 @@ $result_sectioning{'pagesizes'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2,
@@ -525,15 +519,12 @@ $result_nodes{'pagesizes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -541,16 +532,13 @@ $result_nodes{'pagesizes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -565,8 +553,7 @@ 
$result_nodes{'pagesizes'}{'structure'}{'node_next'}{'structure'}{'node_up'} = $
 $result_menus{'pagesizes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index c8c4a78d30..c646c5b353 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -478,12 +478,10 @@ $result_sectioning{'pagetype'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -494,12 +492,10 @@ $result_sectioning{'pagetype'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -511,9 +507,7 @@ $result_sectioning{'pagetype'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2,
@@ -544,15 +538,12 @@ $result_nodes{'pagetype'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -560,16 +551,13 @@ $result_nodes{'pagetype'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -584,8 +572,7 @@ 
$result_nodes{'pagetype'}{'structure'}{'node_next'}{'structure'}{'node_up'} = $r
 $result_menus{'pagetype'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 670319d193..61c68dbbfa 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -289,9 +289,7 @@ $result_sectioning{'settitle_and_headings'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 1,
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 787c756ff9..ca4f04e841 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -325,12 +325,10 @@ $result_sectioning{'shorttitlepage'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -341,12 +339,10 @@ $result_sectioning{'shorttitlepage'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -373,15 +369,12 @@ $result_nodes{'shorttitlepage'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -389,16 +382,13 @@ $result_nodes{'shorttitlepage'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -413,8 +403,7 @@ 
$result_nodes{'shorttitlepage'}{'structure'}{'node_next'}{'structure'}{'node_up'
 $result_menus{'shorttitlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 70c168e26b..f145070835 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -703,12 +703,10 @@ $result_sectioning{'titlepage_classical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -719,12 +717,10 @@ $result_sectioning{'titlepage_classical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -751,15 +747,12 @@ $result_nodes{'titlepage_classical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -767,16 +760,13 @@ $result_nodes{'titlepage_classical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -791,8 +781,7 @@ 
$result_nodes{'titlepage_classical'}{'structure'}{'node_next'}{'structure'}{'nod
 $result_menus{'titlepage_classical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 be33fbd4ef..6bca923e52 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -401,12 +401,10 @@ $result_sectioning{'titlepage_in_top_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -417,12 +415,10 @@ $result_sectioning{'titlepage_in_top_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -449,15 +445,12 @@ $result_nodes{'titlepage_in_top_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -465,16 +458,13 @@ $result_nodes{'titlepage_in_top_node'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -489,8 +479,7 @@ 
$result_nodes{'titlepage_in_top_node'}{'structure'}{'node_next'}{'structure'}{'n
 $result_menus{'titlepage_in_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 25f82944b8..514467060c 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -386,12 +386,10 @@ $result_sectioning{'titlepage_long_title'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -402,12 +400,10 @@ $result_sectioning{'titlepage_long_title'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -434,15 +430,12 @@ $result_nodes{'titlepage_long_title'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -450,16 +443,13 @@ $result_nodes{'titlepage_long_title'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -474,8 +464,7 @@ 
$result_nodes{'titlepage_long_title'}{'structure'}{'node_next'}{'structure'}{'no
 $result_menus{'titlepage_long_title'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index d0d05d59d2..5c1ae8e190 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -368,12 +368,10 @@ $result_sectioning{'titlepage_no_author'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -384,12 +382,10 @@ $result_sectioning{'titlepage_no_author'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -416,15 +412,12 @@ $result_nodes{'titlepage_no_author'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -432,16 +425,13 @@ $result_nodes{'titlepage_no_author'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -456,8 +446,7 @@ 
$result_nodes{'titlepage_no_author'}{'structure'}{'node_next'}{'structure'}{'nod
 $result_menus{'titlepage_no_author'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index b3ad54cd00..b2b439c453 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -410,12 +410,10 @@ $result_sectioning{'titlepage_no_title'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -426,12 +424,10 @@ $result_sectioning{'titlepage_no_title'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -458,15 +454,12 @@ $result_nodes{'titlepage_no_title'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -474,16 +467,13 @@ $result_nodes{'titlepage_no_title'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -498,8 +488,7 @@ 
$result_nodes{'titlepage_no_title'}{'structure'}{'node_next'}{'structure'}{'node
 $result_menus{'titlepage_no_title'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 94e737c5f3..3ca8ca21e0 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -916,12 +916,10 @@ $result_sectioning{'titlepage_with_commands_classical'} = 
{
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -932,12 +930,10 @@ $result_sectioning{'titlepage_with_commands_classical'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -964,15 +960,12 @@ $result_nodes{'titlepage_with_commands_classical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -980,16 +973,13 @@ $result_nodes{'titlepage_with_commands_classical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -1004,8 +994,7 @@ 
$result_nodes{'titlepage_with_commands_classical'}{'structure'}{'node_next'}{'st
 $result_menus{'titlepage_with_commands_classical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index a59494b7f7..fa2820daf0 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ $result_nodes{'navigation'}{'structure'}{'node_next'} = 
$result_nodes{'navigatio
 $result_menus{'navigation'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 9432ef2497..deb2f57968 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_chapter'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_chapter'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_chapter'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_chapter'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_chapter'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_chapter'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_chapter'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_chapter'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_chapter'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_chapter'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_chapter'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_chapter'}{'structure'}{'node_next'} = $result_nodes{'n
 $result_menus{'navigation_chapter'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 0f3a7949fc..d37fafe2b2 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_chapter_no_header'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_chapter_no_header'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_chapter_no_header'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_chapter_no_header'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_chapter_no_header'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_chapter_no_header'}{'structure'}{'node_next'} = $resul
 $result_menus{'navigation_chapter_no_header'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
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 6bb3efd55c..07ba7389db 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -1257,12 +1257,10 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_chapter_no_header_vertical'} 
= {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_chapter_no_header_vertical'}{'structure'}{'node_next'}
 $result_menus{'navigation_chapter_no_header_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index 05cb31430b..a3234f6645 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_chapter_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_chapter_vertical'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_chapter_vertical'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_chapter_vertical'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_chapter_vertical'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_chapter_vertical'}{'structure'}{'node_next'} = $result
 $result_menus{'navigation_chapter_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index fad0c11eac..8b8e86029d 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_no_header'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_no_header'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_no_header'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_no_header'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_no_header'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_no_header'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_no_header'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_no_header'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_no_header'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_no_header'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_no_header'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_no_header'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'navigation_no_header'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index b83b824e72..db98d99864 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_no_header_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_no_header_vertical'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_no_header_vertical'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_no_header_vertical'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_no_header_vertical'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_no_header_vertical'}{'structure'}{'node_next'} = $resu
 $result_menus{'navigation_no_header_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index 74a8013210..10c07e1f26 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_node'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_node'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_node'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_node'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_node'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_node'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_node'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_node'}{'structure'}{'node_next'} = $result_nodes{'navi
 $result_menus{'navigation_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index f64cb2508e..d4f514e3dc 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_node_no_header'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_node_no_header'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_node_no_header'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_node_no_header'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_node_no_header'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_node_no_header'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_node_no_header'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_node_no_header'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_node_no_header'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_node_no_header'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_node_no_header'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_node_no_header'}{'structure'}{'node_next'} = $result_n
 $result_menus{'navigation_node_no_header'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
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 5eea1e3488..f15eb9a36a 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -1257,12 +1257,10 @@ 
$result_sectioning{'navigation_node_no_header_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ 
$result_sectioning{'navigation_node_no_header_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ 
$result_sectioning{'navigation_node_no_header_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ 
$result_sectioning{'navigation_node_no_header_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_node_no_header_vertical'}{'structure'}{'node_next'} =
 $result_menus{'navigation_node_no_header_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index f96098a81c..c5fcb8427f 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_node_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_node_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_node_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_node_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_node_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_node_vertical'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_node_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_node_vertical'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_node_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_node_vertical'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_node_vertical'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_node_vertical'}{'structure'}{'node_next'} = $result_no
 $result_menus{'navigation_node_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 539d7fa0ef..43b5ffa89e 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_section'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_section'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_section'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_section'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_section'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_section'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_section'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_section'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_section'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_section'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_section'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_section'}{'structure'}{'node_next'} = $result_nodes{'n
 $result_menus{'navigation_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 0e46cfae29..ac61bc4b54 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_section_no_header'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_section_no_header'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_section_no_header'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_section_no_header'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_section_no_header'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_section_no_header'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_section_no_header'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_section_no_header'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_section_no_header'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_section_no_header'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_section_no_header'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_section_no_header'}{'structure'}{'node_next'} = $resul
 $result_menus{'navigation_section_no_header'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
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 451f0f2cdd..e7493ae885 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -1257,12 +1257,10 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_section_no_header_vertical'} 
= {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_section_no_header_vertical'}{'structure'}{'node_next'}
 $result_menus{'navigation_section_no_header_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index 0cc749216a..a0316aa415 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_section_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_section_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_section_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_section_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_section_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_section_vertical'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_section_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_section_vertical'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_section_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_section_vertical'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_section_vertical'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_section_vertical'}{'structure'}{'node_next'} = $result
 $result_menus{'navigation_section_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index 5b116805dc..21fc298f82 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -1257,12 +1257,10 @@ $result_sectioning{'navigation_vertical'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1273,12 +1271,10 @@ $result_sectioning{'navigation_vertical'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1290,12 +1286,10 @@ $result_sectioning{'navigation_vertical'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1307,12 +1301,10 @@ $result_sectioning{'navigation_vertical'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1349,9 +1341,7 @@ $result_nodes{'navigation_vertical'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1359,20 +1349,10 @@ $result_nodes{'navigation_vertical'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1380,9 +1360,7 @@ $result_nodes{'navigation_vertical'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1391,20 +1369,10 @@ $result_nodes{'navigation_vertical'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1412,9 +1380,7 @@ $result_nodes{'navigation_vertical'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1423,20 +1389,10 @@ $result_nodes{'navigation_vertical'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1444,16 +1400,13 @@ $result_nodes{'navigation_vertical'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_up' => {}
@@ -1478,29 +1431,25 @@ 
$result_nodes{'navigation_vertical'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'navigation_vertical'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 500d4e78c4..ecb8acce36 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -672,12 +672,10 @@ $result_sectioning{'no_monolithic'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -689,12 +687,10 @@ $result_sectioning{'no_monolithic'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -721,9 +717,7 @@ $result_nodes{'no_monolithic'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -731,20 +725,10 @@ $result_nodes{'no_monolithic'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -752,17 +736,14 @@ $result_nodes{'no_monolithic'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -779,16 +760,14 @@ $result_nodes{'no_monolithic'}{'structure'}{'node_next'} 
= $result_nodes{'no_mon
 $result_menus{'no_monolithic'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 39903e56e5..cc3215facb 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -377,8 +377,7 @@ $result_nodes{'backslash_in_arg'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -387,8 +386,7 @@ $result_menus{'backslash_in_arg'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index cf4b964c80..4267bd8c6d 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -1097,8 +1097,7 @@ $result_nodes{'macro_in_index_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -1107,8 +1106,7 @@ $result_menus{'macro_in_index_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 054bcef7c2..3d1e286bfa 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -4274,12 +4274,10 @@ $result_sectioning{'macro_in_misc_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -4290,12 +4288,10 @@ $result_sectioning{'macro_in_misc_commands'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'node-atext',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node-atext'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4322,9 +4318,7 @@ $result_nodes{'macro_in_misc_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -4332,20 +4326,10 @@ $result_nodes{'macro_in_misc_commands'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -4353,16 +4337,13 @@ $result_nodes{'macro_in_misc_commands'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'node-atext',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-atext'
       },
       'structure' => {
         'node_prev' => {},
@@ -4379,15 +4360,13 @@ 
$result_nodes{'macro_in_misc_commands'}{'structure'}{'node_next'} = $result_node
 $result_menus{'macro_in_misc_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-atext',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-atext'
       },
       'structure' => {
         'menu_up' => {},
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 f91e3f2337..18be427b95 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -730,12 +730,10 @@ $result_sectioning{'block_commands_in_menu_description'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -752,9 +750,7 @@ $result_nodes{'block_commands_in_menu_description'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -762,20 +758,10 @@ $result_nodes{'block_commands_in_menu_description'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -795,8 +781,7 @@ 
$result_nodes{'block_commands_in_menu_description'}{'structure'}{'node_next'} =
 $result_menus{'block_commands_in_menu_description'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 1e2b457fd0..8762b88747 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -331,12 +331,10 @@ $result_sectioning{'comment_on_menu_line'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -354,9 +352,7 @@ $result_nodes{'comment_on_menu_line'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1,
         'number' => 1
@@ -365,28 +361,16 @@ $result_nodes{'comment_on_menu_line'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          },
-          'spaces_before_argument' => '  '
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'node_prev' => {},
@@ -403,15 +387,13 @@ 
$result_nodes{'comment_on_menu_line'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'comment_on_menu_line'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index abd6274984..5ffba9e347 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -1540,12 +1540,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1556,12 +1554,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1573,12 +1569,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1598,12 +1592,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1615,12 +1607,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-chap-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-chap-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1634,12 +1624,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1679,9 +1667,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1689,20 +1675,10 @@ $result_nodes{'detailmenu_on_subnodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1710,9 +1686,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1721,20 +1695,10 @@ $result_nodes{'detailmenu_on_subnodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1742,16 +1706,13 @@ $result_nodes{'detailmenu_on_subnodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
               }
             },
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'node_up' => {}
@@ -1762,9 +1723,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
@@ -1773,20 +1732,10 @@ $result_nodes{'detailmenu_on_subnodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'chapter-2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-2'
           },
           'structure' => {
             'menu_child' => {
@@ -1794,16 +1743,13 @@ $result_nodes{'detailmenu_on_subnodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '2.1'
                   }
                 },
-                'normalized' => 'section-chap-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-chap-2'
               },
               'structure' => {
                 'node_next' => {
@@ -1811,15 +1757,12 @@ $result_nodes{'detailmenu_on_subnodes'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2
                       }
                     },
-                    'normalized' => 'unnumberedsec',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumberedsec'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -1853,22 +1796,19 @@ 
$result_nodes{'detailmenu_on_subnodes'}{'structure'}{'node_next'} = $result_node
 $result_menus{'detailmenu_on_subnodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_up' => {},
@@ -1880,22 +1820,19 @@ $result_menus{'detailmenu_on_subnodes'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'chapter-2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter-2'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-chap-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-chap-2'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumberedsec',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumberedsec'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 66dc800316..814ea7bc08 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -278,28 +278,17 @@ $result_nodes{'detailmenu_unknown_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'detailmenu_unknown_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 83b29cf1b8..1a4b64dc1a 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -316,12 +316,10 @@ 
$result_sectioning{'direntry_dircategory_after_first_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -338,15 +336,12 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -354,8 +349,7 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
 $result_menus{'direntry_dircategory_after_first_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index eb724669ca..a2a03c08db 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -378,20 +378,10 @@ $result_nodes{'empty_menu_entry_name'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -411,8 +401,7 @@ 
$result_nodes{'empty_menu_entry_name'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'empty_menu_entry_name'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 229330e96a..376c1fdfb6 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -713,34 +713,22 @@ $result_nodes{'entry_after_detailmenu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'node_prev' => {},
@@ -763,22 +751,19 @@ 
$result_nodes{'entry_after_detailmenu'}{'structure'}{'node_next'} = $result_node
 $result_menus{'entry_after_detailmenu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 57e465a9a6..832b894494 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -381,12 +381,10 @@ $result_sectioning{'example_in_menu_description'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -403,9 +401,7 @@ $result_nodes{'example_in_menu_description'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -413,20 +409,10 @@ $result_nodes{'example_in_menu_description'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -446,8 +432,7 @@ 
$result_nodes{'example_in_menu_description'}{'structure'}{'node_next'} = $result
 $result_menus{'example_in_menu_description'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index aa99f540d5..a9d407837b 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -939,20 +939,10 @@ $result_nodes{'formats_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -972,8 +962,7 @@ $result_nodes{'formats_in_menu'}{'structure'}{'node_next'} 
= $result_nodes{'form
 $result_menus{'formats_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index de4ec2d9d7..c45b9d1da7 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -354,12 +354,10 @@ $result_sectioning{'inlineraw_in_menu_description'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -376,9 +374,7 @@ $result_nodes{'inlineraw_in_menu_description'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -386,20 +382,10 @@ $result_nodes{'inlineraw_in_menu_description'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -419,8 +405,7 @@ 
$result_nodes{'inlineraw_in_menu_description'}{'structure'}{'node_next'} = $resu
 $result_menus{'inlineraw_in_menu_description'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 253a6aa796..9fe505e0cc 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -767,20 +767,10 @@ $result_nodes{'invalid_info_menu_entry'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -801,8 +791,7 @@ 
$result_nodes{'invalid_info_menu_entry'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'invalid_info_menu_entry'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index c240bb9fcf..2de39ec9cd 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -383,8 +383,7 @@ a: b c
 $result_nodes{'menu_in_deffn'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -392,8 +391,7 @@ $result_nodes{'menu_in_deffn'} = {
 $result_menus{'menu_in_deffn'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 1540c76810..1c08f9c7ea 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -683,16 +683,14 @@ in cartouche in menu comment in menu in example
 $result_nodes{'menu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'menu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index 5c3ebd7b27..ac1c511177 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -225,20 +225,10 @@ $result_nodes{'menu_node_unterminated'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -246,8 +236,7 @@ $result_nodes{'menu_node_unterminated'} = {
 $result_menus{'menu_node_unterminated'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index ced158eb8a..f92195dd85 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -328,12 +328,10 @@ $result_sectioning{'menu_pointing_to_anchor'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -350,9 +348,7 @@ $result_nodes{'menu_pointing_to_anchor'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -360,20 +356,10 @@ $result_nodes{'menu_pointing_to_anchor'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -394,8 +380,7 @@ 
$result_nodes{'menu_pointing_to_anchor'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'menu_pointing_to_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 6fdbc1b423..416bc51417 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -294,27 +294,16 @@ $result_nodes{'menu_title_before_entries'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'subnode',
-        'spaces_before_argument' => ' '
+        'normalized' => 'subnode'
       },
       'structure' => {
         'node_prev' => {},
@@ -331,15 +320,13 @@ 
$result_nodes{'menu_title_before_entries'}{'structure'}{'node_next'} = $result_n
 $result_menus{'menu_title_before_entries'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'subnode',
-        'spaces_before_argument' => ' '
+        'normalized' => 'subnode'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index ee8817b965..1dce240ced 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -394,33 +394,14 @@ $result_nodes{'multiple_menus'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       },
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -441,8 +422,7 @@ $result_nodes{'multiple_menus'}{'structure'}{'node_next'} = 
$result_nodes{'multi
 $result_menus{'multiple_menus'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 3788cae706..8bae398ae1 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -169,28 +169,17 @@ $result_nodes{'no_colon_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'no_colon_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 73119f8433..6c35880e76 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -235,20 +235,10 @@ $result_nodes{'reference_to_external_manual'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -268,8 +258,7 @@ 
$result_nodes{'reference_to_external_manual'}{'structure'}{'node_next'} = $resul
 $result_menus{'reference_to_external_manual'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index c92cdceada..cb55b513fc 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1033,27 +1033,16 @@ $result_nodes{'sc_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'NODE',
-        'spaces_before_argument' => ' '
+        'normalized' => 'NODE'
       },
       'structure' => {
         'node_prev' => {},
@@ -1070,15 +1059,13 @@ $result_nodes{'sc_in_menu'}{'structure'}{'node_next'} = 
$result_nodes{'sc_in_men
 $result_menus{'sc_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'NODE',
-        'spaces_before_argument' => ' '
+        'normalized' => 'NODE'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 84960ab4a3..691228d25f 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -791,16 +791,14 @@ subheading in menu
 $result_nodes{'submenu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'submenu_in_example'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 1d38f9d6cc..4c9f390364 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -336,12 +336,10 @@ $result_sectioning{'verb_in_menu_description'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -358,9 +356,7 @@ $result_nodes{'verb_in_menu_description'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -368,20 +364,10 @@ $result_nodes{'verb_in_menu_description'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -401,8 +387,7 @@ 
$result_nodes{'verb_in_menu_description'}{'structure'}{'node_next'} = $result_no
 $result_menus{'verb_in_menu_description'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index a49e83bea0..c6e3327b48 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5119,11 +5119,9 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -5140,23 +5138,19 @@ $result_nodes{'codequoteundirected_codequotebacktick'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'codequoteundirected_codequotebacktick'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 5c84de8fd3..e10f492eab 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
@@ -738,11 +738,9 @@ $result_sectioning{'comment_space_command_on_line'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -759,16 +757,13 @@ $result_nodes{'comment_space_command_on_line'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -776,8 +771,7 @@ $result_menus{'comment_space_command_on_line'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -789,25 +783,14 @@ $result_floats{'comment_space_command_on_line'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 0
           }
         },
         'normalized' => 'label',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index 15e6786fe5..8941a2a03c 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -168,26 +168,20 @@ $result_sectioning{'no_empty_line_between_headings'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 30636d2c40..071e7e2e08 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -242,16 +242,14 @@ very long
 $result_nodes{'ref_in_center'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'ref_in_center'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 9ac4a4ab87..caadd699bf 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2689,16 +2689,14 @@ in-example
 $result_nodes{'test_allowcodebreaks'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'test_allowcodebreaks'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 fe60c9c31f..dd212f0630 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -364,12 +364,10 @@ $result_sectioning{'text_before_line_command'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'LD-Version-Scripts',
-              'spaces_before_argument' => ' '
+              'normalized' => 'LD-Version-Scripts'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -387,16 +385,13 @@ $result_nodes{'text_before_line_command'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1,
         'number' => 1
       }
     },
-    'normalized' => 'LD-Version-Scripts',
-    'spaces_before_argument' => ' '
+    'normalized' => 'LD-Version-Scripts'
   },
   'structure' => {}
 };
@@ -404,8 +399,7 @@ $result_nodes{'text_before_line_command'} = {
 $result_menus{'text_before_line_command'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'LD-Version-Scripts',
-    'spaces_before_argument' => ' '
+    'normalized' => 'LD-Version-Scripts'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 8398b6ef67..bae46994c7 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4290,12 +4290,10 @@ $result_sectioning{'formatting_fr'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -4306,12 +4304,10 @@ $result_sectioning{'formatting_fr'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4323,12 +4319,10 @@ $result_sectioning{'formatting_fr'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 's_002d_002dect_002cion',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 's_002d_002dect_002cion'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -4340,12 +4334,10 @@ $result_sectioning{'formatting_fr'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -4357,12 +4349,10 @@ $result_sectioning{'formatting_fr'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d'
                                     },
                                     'structure' => {}
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -4376,12 +4366,10 @@ $result_sectioning{'formatting_fr'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
                                     },
                                     'structure' => {}
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -4411,12 +4399,10 @@ $result_sectioning{'formatting_fr'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4452,9 +4438,7 @@ $result_nodes{'formatting_fr'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -4463,20 +4447,10 @@ $result_nodes{'formatting_fr'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -4484,16 +4458,13 @@ $result_nodes{'formatting_fr'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_next' => {
@@ -4501,16 +4472,13 @@ $result_nodes{'formatting_fr'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'centerchap',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1
               }
             },
             'isindex' => 1,
-            'normalized' => 'chapter2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter2'
           },
           'structure' => {
             'node_prev' => {},
@@ -4534,23 +4502,20 @@ $result_menus{'formatting_fr'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'chapter2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter2'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 76144c154b..a9f1c66c18 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -4290,12 +4290,10 @@ $result_sectioning{'texi_formatting'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -4306,12 +4304,10 @@ $result_sectioning{'texi_formatting'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4323,12 +4319,10 @@ $result_sectioning{'texi_formatting'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 's_002d_002dect_002cion',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 's_002d_002dect_002cion'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -4340,12 +4334,10 @@ $result_sectioning{'texi_formatting'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -4357,12 +4349,10 @@ $result_sectioning{'texi_formatting'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 
'subsubsection-_0060_0060simple_002ddouble_002d_002d'
                                     },
                                     'structure' => {}
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -4376,12 +4366,10 @@ $result_sectioning{'texi_formatting'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 
'subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027'
                                     },
                                     'structure' => {}
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -4411,12 +4399,10 @@ $result_sectioning{'texi_formatting'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -4452,9 +4438,7 @@ $result_nodes{'texi_formatting'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -4463,20 +4447,10 @@ $result_nodes{'texi_formatting'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -4484,16 +4458,13 @@ $result_nodes{'texi_formatting'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_next' => {
@@ -4501,16 +4472,13 @@ $result_nodes{'texi_formatting'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'centerchap',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1
               }
             },
             'isindex' => 1,
-            'normalized' => 'chapter2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter2'
           },
           'structure' => {
             'node_prev' => {},
@@ -4534,23 +4502,20 @@ $result_menus{'texi_formatting'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'chapter2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter2'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index 03cefbdecb..de41cf333d 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -574,28 +574,17 @@ $result_nodes{'double_index_entry'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'other-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -612,16 +601,14 @@ 
$result_nodes{'double_index_entry'}{'structure'}{'node_next'} = $result_nodes{'d
 $result_menus{'double_index_entry'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'other-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/moreindices/index_no_node.pl 
b/tp/t/results/moreindices/index_no_node.pl
index 65cace8884..ef2f9e4976 100644
--- a/tp/t/results/moreindices/index_no_node.pl
+++ b/tp/t/results/moreindices/index_no_node.pl
@@ -1430,9 +1430,7 @@ $result_sectioning{'index_no_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_up' => {}
@@ -1440,17 +1438,13 @@ $result_sectioning{'index_no_node'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'section_up' => {}
@@ -1464,9 +1458,7 @@ $result_sectioning{'index_no_node'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 1,
@@ -1478,9 +1470,7 @@ $result_sectioning{'index_no_node'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 2,
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index 423bb608df..8e45bdc840 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -3786,12 +3786,10 @@ $result_sectioning{'index_split'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3803,12 +3801,10 @@ $result_sectioning{'index_split'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'first',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'first'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3821,12 +3817,10 @@ $result_sectioning{'index_split'} = {
                         'cmdname' => 'node',
                         'extra' => {
                           'isindex' => 1,
-                          'normalized' => 'section-1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3838,12 +3832,10 @@ $result_sectioning{'index_split'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection-1',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-1'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3858,12 +3850,10 @@ $result_sectioning{'index_split'} = {
                               'cmdname' => 'node',
                               'extra' => {
                                 'isindex' => 1,
-                                'normalized' => 'subsection-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3882,12 +3872,10 @@ $result_sectioning{'index_split'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3903,12 +3891,10 @@ $result_sectioning{'index_split'} = {
                         'cmdname' => 'node',
                         'extra' => {
                           'isindex' => 1,
-                          'normalized' => 'section-3',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-3'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3929,12 +3915,10 @@ $result_sectioning{'index_split'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'second-chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'second-chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3974,9 +3958,7 @@ $result_nodes{'index_split'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3985,20 +3967,10 @@ $result_nodes{'index_split'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
@@ -4007,9 +3979,7 @@ $result_nodes{'index_split'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -4019,20 +3989,10 @@ $result_nodes{'index_split'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -4040,9 +4000,7 @@ $result_nodes{'index_split'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -4052,20 +4010,10 @@ $result_nodes{'index_split'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section-1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-1'
           },
           'structure' => {
             'menu_child' => {
@@ -4073,16 +4021,13 @@ $result_nodes{'index_split'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection-1',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection-1'
               },
               'structure' => {
                 'node_next' => {
@@ -4090,17 +4035,14 @@ $result_nodes{'index_split'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'subsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 3,
                         'number' => '1.1.2'
                       }
                     },
                     'isindex' => 1,
-                    'normalized' => 'subsection-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'subsection-2'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -4115,16 +4057,13 @@ $result_nodes{'index_split'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '1.2'
                   }
                 },
-                'normalized' => 'section-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-2'
               },
               'structure' => {
                 'node_next' => {
@@ -4132,24 +4071,20 @@ $result_nodes{'index_split'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'section',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2,
                         'number' => '1.3'
                       }
                     },
                     'isindex' => 1,
-                    'normalized' => 'section-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'section-3'
                   },
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'node-in-section-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'node-in-section-3'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -4172,16 +4107,13 @@ $result_nodes{'index_split'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'second-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second-chapter'
           },
           'structure' => {
             'node_prev' => {},
@@ -4214,8 +4146,7 @@ $result_menus{'index_split'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
@@ -4223,31 +4154,27 @@ $result_menus{'index_split'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'section-1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-1'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection-1',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection-1'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'subsection-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'subsection-2'
                   },
                   'structure' => {
                     'menu_prev' => {},
@@ -4266,38 +4193,33 @@ $result_menus{'index_split'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-2'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'section-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'section-3'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'node-in-section-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'node-in-section-3'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'isindex' => 1,
-                            'normalized' => 'node-2-in-section-3',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'node-2-in-section-3'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'node-3-in-section-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'node-3-in-section-3'
                               },
                               'structure' => {
                                 'menu_prev' => {},
@@ -4344,8 +4266,7 @@ $result_menus{'index_split'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'second-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second-chapter'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index 29b9ced5a4..68df69925f 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -3786,12 +3786,10 @@ $result_sectioning{'index_split_nodes'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3803,12 +3801,10 @@ $result_sectioning{'index_split_nodes'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'first',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'first'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3821,12 +3817,10 @@ $result_sectioning{'index_split_nodes'} = {
                         'cmdname' => 'node',
                         'extra' => {
                           'isindex' => 1,
-                          'normalized' => 'section-1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3838,12 +3832,10 @@ $result_sectioning{'index_split_nodes'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection-1',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-1'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3858,12 +3850,10 @@ $result_sectioning{'index_split_nodes'} = {
                               'cmdname' => 'node',
                               'extra' => {
                                 'isindex' => 1,
-                                'normalized' => 'subsection-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3882,12 +3872,10 @@ $result_sectioning{'index_split_nodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3903,12 +3891,10 @@ $result_sectioning{'index_split_nodes'} = {
                         'cmdname' => 'node',
                         'extra' => {
                           'isindex' => 1,
-                          'normalized' => 'section-3',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-3'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3929,12 +3915,10 @@ $result_sectioning{'index_split_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'second-chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'second-chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3974,9 +3958,7 @@ $result_nodes{'index_split_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3985,20 +3967,10 @@ $result_nodes{'index_split_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
@@ -4007,9 +3979,7 @@ $result_nodes{'index_split_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -4019,20 +3989,10 @@ $result_nodes{'index_split_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -4040,9 +4000,7 @@ $result_nodes{'index_split_nodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -4052,20 +4010,10 @@ $result_nodes{'index_split_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section-1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-1'
           },
           'structure' => {
             'menu_child' => {
@@ -4073,16 +4021,13 @@ $result_nodes{'index_split_nodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection-1',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection-1'
               },
               'structure' => {
                 'node_next' => {
@@ -4090,17 +4035,14 @@ $result_nodes{'index_split_nodes'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'subsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 3,
                         'number' => '1.1.2'
                       }
                     },
                     'isindex' => 1,
-                    'normalized' => 'subsection-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'subsection-2'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -4115,16 +4057,13 @@ $result_nodes{'index_split_nodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '1.2'
                   }
                 },
-                'normalized' => 'section-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-2'
               },
               'structure' => {
                 'node_next' => {
@@ -4132,24 +4071,20 @@ $result_nodes{'index_split_nodes'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'section',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2,
                         'number' => '1.3'
                       }
                     },
                     'isindex' => 1,
-                    'normalized' => 'section-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'section-3'
                   },
                   'structure' => {
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'node-in-section-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'node-in-section-3'
                       },
                       'structure' => {
                         'node_prev' => {},
@@ -4172,16 +4107,13 @@ $result_nodes{'index_split_nodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'second-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second-chapter'
           },
           'structure' => {
             'node_prev' => {},
@@ -4214,8 +4146,7 @@ $result_menus{'index_split_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
@@ -4223,31 +4154,27 @@ $result_menus{'index_split_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'section-1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-1'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection-1',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection-1'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'subsection-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'subsection-2'
                   },
                   'structure' => {
                     'menu_prev' => {},
@@ -4266,38 +4193,33 @@ $result_menus{'index_split_nodes'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-2'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'section-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'section-3'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'node-in-section-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'node-in-section-3'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'isindex' => 1,
-                            'normalized' => 'node-2-in-section-3',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'node-2-in-section-3'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'node-3-in-section-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'node-3-in-section-3'
                               },
                               'structure' => {
                                 'menu_prev' => {},
@@ -4344,8 +4266,7 @@ $result_menus{'index_split_nodes'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'second-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second-chapter'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top.pl 
b/tp/t/results/moreindices/nodes_before_top.pl
index 17f17ad19c..627f2604c6 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -2575,20 +2575,10 @@ $result_nodes{'nodes_before_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2598,20 +2588,10 @@ $result_nodes{'nodes_before_top'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -2621,35 +2601,23 @@ $result_nodes{'nodes_before_top'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -2673,28 +2641,17 @@ $result_nodes{'nodes_before_top'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first-before-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-before-top'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'node-in-menu-before-top',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-in-menu-before-top'
           },
           'structure' => {
             'node_up' => {}
@@ -2727,39 +2684,34 @@ $result_menus{'nodes_before_top'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'menu_prev' => {},
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 ecadf6bf53..e0355a312b 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
@@ -3275,12 +3275,10 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
             'cmdname' => 'node',
             'extra' => {
               'isindex' => 1,
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3292,12 +3290,10 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3324,9 +3320,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -3335,20 +3329,10 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3358,20 +3342,10 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -3381,35 +3355,23 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3433,28 +3395,17 @@ 
$result_nodes{'nodes_before_top_and_sections_monolithic'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first-before-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-before-top'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'node-in-menu-before-top',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-in-menu-before-top'
           },
           'structure' => {
             'node_up' => {}
@@ -3487,39 +3438,34 @@ 
$result_menus{'nodes_before_top_and_sections_monolithic'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'menu_prev' => {},
@@ -3545,15 +3491,13 @@ 
$result_menus{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chapter'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'node-in-chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'node-in-chapter'
               },
               'structure' => {
                 'menu_prev' => {},
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 a84c337438..8031a80dc1 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -2575,20 +2575,10 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2598,20 +2588,10 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -2621,35 +2601,23 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -2673,28 +2641,17 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first-before-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-before-top'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'node-in-menu-before-top',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-in-menu-before-top'
           },
           'structure' => {
             'node_up' => {}
@@ -2727,39 +2684,34 @@ $result_menus{'nodes_before_top_no_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index 4ebcfb57d2..30955069d3 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -2575,20 +2575,10 @@ $result_nodes{'nodes_before_top_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2598,20 +2588,10 @@ $result_nodes{'nodes_before_top_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -2621,35 +2601,23 @@ $result_nodes{'nodes_before_top_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -2673,28 +2641,17 @@ $result_nodes{'nodes_before_top_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first-before-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-before-top'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'node-in-menu-before-top',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-in-menu-before-top'
           },
           'structure' => {
             'node_up' => {}
@@ -2727,39 +2684,34 @@ $result_menus{'nodes_before_top_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
             'isindex' => 1,
-            'normalized' => 'second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
                 'isindex' => 1,
-                'normalized' => 'a-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'a-node'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'another',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'another'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index b97615584e..5078d6cd08 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -1667,12 +1667,10 @@ $result_sectioning{'split_chapter_index'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1684,12 +1682,10 @@ $result_sectioning{'split_chapter_index'} = {
                   'cmdname' => 'node',
                   'extra' => {
                     'isindex' => 1,
-                    'normalized' => 'first',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'first'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1701,12 +1697,10 @@ $result_sectioning{'split_chapter_index'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1718,12 +1712,10 @@ $result_sectioning{'split_chapter_index'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection-1',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-1'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1760,9 +1752,7 @@ $result_nodes{'split_chapter_index'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1770,20 +1760,10 @@ $result_nodes{'split_chapter_index'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1791,9 +1771,7 @@ $result_nodes{'split_chapter_index'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1803,20 +1781,10 @@ $result_nodes{'split_chapter_index'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
@@ -1824,9 +1792,7 @@ $result_nodes{'split_chapter_index'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1835,20 +1801,10 @@ $result_nodes{'split_chapter_index'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section-1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-1'
           },
           'structure' => {
             'menu_child' => {
@@ -1856,16 +1812,13 @@ $result_nodes{'split_chapter_index'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection-1',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection-1'
               },
               'structure' => {
                 'node_up' => {}
@@ -1890,30 +1843,26 @@ 
$result_nodes{'split_chapter_index'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'split_chapter_index'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section-1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-1'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection-1',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection-1'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl 
b/tp/t/results/moresectioning/equivalent_nodes.pl
index 0ce9b34f75..92014f6b3e 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -911,27 +911,16 @@ $result_nodes{'equivalent_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'node_prev' => {},
@@ -948,15 +937,13 @@ 
$result_nodes{'equivalent_nodes'}{'structure'}{'node_next'} = $result_nodes{'equ
 $result_menus{'equivalent_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'menu_up' => {},
@@ -1032,15 +1019,6 @@ $result_floats{'equivalent_nodes'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl 
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index c6690535bd..ac5df6db97 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -911,27 +911,16 @@ $result_nodes{'equivalent_nodes_no_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'node_prev' => {},
@@ -948,15 +937,13 @@ 
$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'node_next'} = $result_no
 $result_menus{'equivalent_nodes_no_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'menu_up' => {},
@@ -1032,15 +1019,6 @@ $result_floats{'equivalent_nodes_no_node'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 5a98d06dfc..85d950fb3a 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -1467,21 +1467,17 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -1496,12 +1492,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'n-c2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'n-c2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1509,9 +1503,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.1',
@@ -1531,12 +1523,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'n-c3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'n-c3'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1544,9 +1534,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '3.1',
@@ -1559,12 +1547,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'n-c3-s-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'n-c3-s-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1575,9 +1561,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '3.3',
@@ -1594,27 +1578,21 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 4,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '4.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '4.1.1',
@@ -1627,12 +1605,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'n-c3-s1-s2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'n-c3-s1-s2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1654,9 +1630,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             {
               'cmdname' => 'appendix',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 'A',
@@ -1709,9 +1683,7 @@ $result_nodes{'more_sections_than_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1719,20 +1691,10 @@ $result_nodes{'more_sections_than_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1740,16 +1702,13 @@ $result_nodes{'more_sections_than_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 2
           }
         },
-        'normalized' => 'n-c2',
-        'spaces_before_argument' => ' '
+        'normalized' => 'n-c2'
       },
       'structure' => {
         'node_next' => {
@@ -1757,9 +1716,7 @@ $result_nodes{'more_sections_than_nodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3
@@ -1768,20 +1725,10 @@ $result_nodes{'more_sections_than_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'n-c3',
-            'spaces_before_argument' => ' '
+            'normalized' => 'n-c3'
           },
           'structure' => {
             'menu_child' => {
@@ -1789,16 +1736,13 @@ $result_nodes{'more_sections_than_nodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '3.2'
                   }
                 },
-                'normalized' => 'n-c3-s-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s-2'
               },
               'structure' => {
                 'node_up' => {}
@@ -1809,16 +1753,13 @@ $result_nodes{'more_sections_than_nodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '4.1.2'
                   }
                 },
-                'normalized' => 'n-c3-s1-s2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s1-s2'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1848,29 +1789,25 @@ 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'node_next'} = $result_no
 $result_menus{'more_sections_than_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'n-c2',
-        'spaces_before_argument' => ' '
+        'normalized' => 'n-c2'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'n-c3',
-            'spaces_before_argument' => ' '
+            'normalized' => 'n-c3'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'n-c3-s-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s-2'
               },
               'structure' => {
                 'menu_up' => {},
@@ -1882,8 +1819,7 @@ $result_menus{'more_sections_than_nodes'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'n-c3-s1-s2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s1-s2'
               },
               'structure' => {
                 'menu_prev' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl 
b/tp/t/results/moresectioning/node_footnote_end.pl
index bf051ad43c..c5c6646841 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -1439,12 +1439,10 @@ $result_sectioning{'node_footnote_end'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -1463,34 +1461,22 @@ $result_nodes{'node_footnote_end'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e1',
-        'spaces_before_argument' => ' '
+        'normalized' => '_00e1'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e2',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e2'
           },
           'structure' => {
             'node_next' => {
@@ -1498,9 +1484,7 @@ $result_nodes{'node_footnote_end'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 1
@@ -1509,27 +1493,16 @@ $result_nodes{'node_footnote_end'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -1566,36 +1539,31 @@ 
$result_nodes{'node_footnote_end'}{'structure'}{'node_next'} = $result_nodes{'no
 $result_menus{'node_footnote_end'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e1',
-        'spaces_before_argument' => ' '
+        'normalized' => '_00e1'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e2',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e2'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index 71bc46ed9d..a0549a71e3 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -1439,12 +1439,10 @@ $result_sectioning{'node_footnote_separated'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -1463,34 +1461,22 @@ $result_nodes{'node_footnote_separated'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e1',
-        'spaces_before_argument' => ' '
+        'normalized' => '_00e1'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e2',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e2'
           },
           'structure' => {
             'node_next' => {
@@ -1498,9 +1484,7 @@ $result_nodes{'node_footnote_separated'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 1
@@ -1509,27 +1493,16 @@ $result_nodes{'node_footnote_separated'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -1566,36 +1539,31 @@ 
$result_nodes{'node_footnote_separated'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'node_footnote_separated'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e1',
-        'spaces_before_argument' => ' '
+        'normalized' => '_00e1'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e2',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e2'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index a12b5100ab..ed75daacfc 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -1439,12 +1439,10 @@ $result_sectioning{'node_footnote_use_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -1463,34 +1461,22 @@ $result_nodes{'node_footnote_use_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e1',
-        'spaces_before_argument' => ' '
+        'normalized' => '_00e1'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e2',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e2'
           },
           'structure' => {
             'node_next' => {
@@ -1498,9 +1484,7 @@ $result_nodes{'node_footnote_use_node'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 1
@@ -1509,27 +1493,16 @@ $result_nodes{'node_footnote_use_node'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -1566,36 +1539,31 @@ 
$result_nodes{'node_footnote_use_node'}{'structure'}{'node_next'} = $result_node
 $result_menus{'node_footnote_use_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_00e1',
-        'spaces_before_argument' => ' '
+        'normalized' => '_00e1'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => '_00e2',
-            'spaces_before_argument' => ' '
+            'normalized' => '_00e2'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => '_00e0',
-                    'spaces_before_argument' => ' '
+                    'normalized' => '_00e0'
                   },
                   'structure' => {
                     'menu_prev' => {},
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 7eaf076e22..c5e86ed0b2 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -688,12 +688,10 @@ $result_sectioning{'nodes_after_top_before_chapter'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -712,27 +710,16 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -740,16 +727,13 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -772,22 +756,19 @@ 
$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'node_next'} = $res
 $result_menus{'nodes_after_top_before_chapter'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
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 319465d297..5e585a0792 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
@@ -688,12 +688,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -712,27 +710,16 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -740,16 +727,13 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -772,22 +756,19 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'
 $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
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 ddbec3d82e..e8a97db96a 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -688,12 +688,10 @@ $result_sectioning{'nodes_after_top_before_section'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 3,
@@ -712,27 +710,16 @@ $result_nodes{'nodes_after_top_before_section'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -740,16 +727,13 @@ $result_nodes{'nodes_after_top_before_section'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 3,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -772,22 +756,19 @@ 
$result_nodes{'nodes_after_top_before_section'}{'structure'}{'node_next'} = $res
 $result_menus{'nodes_after_top_before_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
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 66db2e0510..4ec98e032a 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
@@ -688,12 +688,10 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 3,
@@ -712,27 +710,16 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -740,16 +727,13 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} 
= {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 3,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -772,22 +756,19 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'node_nex
 $result_menus{'nodes_after_top_before_section_use_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
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 39ecb11bc1..c82624a9a1 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
@@ -688,12 +688,10 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 3,
@@ -712,27 +710,16 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -740,16 +727,13 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 3,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -772,22 +756,19 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'
 $result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 834e010e34..7e803a0f8f 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -1060,9 +1060,7 @@ $result_sectioning{'placed_things_before_element'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -1092,16 +1090,7 @@ $result_floats{'placed_things_before_element'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float-anchor',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 851dc548e2..7a7444378a 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -3118,8 +3118,7 @@ $result_sectioning{'sectioning_frames'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -3133,12 +3132,10 @@ $result_sectioning{'sectioning_frames'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'First-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'First-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3150,12 +3147,10 @@ $result_sectioning{'sectioning_frames'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumbered'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3166,12 +3161,10 @@ $result_sectioning{'sectioning_frames'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3184,12 +3177,10 @@ $result_sectioning{'sectioning_frames'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3203,12 +3194,10 @@ $result_sectioning{'sectioning_frames'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3222,12 +3211,10 @@ $result_sectioning{'sectioning_frames'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3245,12 +3232,10 @@ $result_sectioning{'sectioning_frames'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumbered2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumbered2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3261,12 +3246,10 @@ $result_sectioning{'sectioning_frames'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -3284,12 +3267,10 @@ $result_sectioning{'sectioning_frames'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'numbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'numbered'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => '  '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -3310,12 +3291,10 @@ $result_sectioning{'sectioning_frames'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Second-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Second-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3332,12 +3311,10 @@ $result_sectioning{'sectioning_frames'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Third-node-unnumbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Third-node-unnumbered'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3393,20 +3370,10 @@ $result_nodes{'sectioning_frames'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -3414,9 +3381,7 @@ $result_nodes{'sectioning_frames'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -3425,20 +3390,10 @@ $result_nodes{'sectioning_frames'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'First-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'First-node'
       },
       'structure' => {
         'menu_child' => {
@@ -3446,9 +3401,7 @@ $result_nodes{'sectioning_frames'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'unnumberedsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2
               }
@@ -3456,20 +3409,10 @@ $result_nodes{'sectioning_frames'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'unnumbered'
           },
           'structure' => {
             'menu_child' => {
@@ -3477,15 +3420,12 @@ $result_nodes{'sectioning_frames'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'unnumberedsubsec',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3
                   }
                 },
-                'normalized' => 'unnumbered-sub',
-                'spaces_before_argument' => ' '
+                'normalized' => 'unnumbered-sub'
               },
               'structure' => {
                 'node_next' => {
@@ -3493,15 +3433,12 @@ $result_nodes{'sectioning_frames'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'subsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 3
                       }
                     },
-                    'normalized' => 'numbered-sub',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'numbered-sub'
                   },
                   'structure' => {
                     'node_next' => {
@@ -3509,15 +3446,12 @@ $result_nodes{'sectioning_frames'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsubsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3
                           }
                         },
-                        'normalized' => 'unnumbered-sub2',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-sub2'
                       },
                       'structure' => {
                         'node_next' => {
@@ -3525,15 +3459,12 @@ $result_nodes{'sectioning_frames'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'subsection',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'numbered-sub2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub2'
                           },
                           'structure' => {
                             'node_prev' => {},
@@ -3556,9 +3487,7 @@ $result_nodes{'sectioning_frames'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'unnumberedsec',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2
                   }
@@ -3566,20 +3495,10 @@ $result_nodes{'sectioning_frames'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'unnumbered2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'unnumbered2'
               },
               'structure' => {
                 'menu_child' => {
@@ -3587,15 +3506,12 @@ $result_nodes{'sectioning_frames'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'subsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 3
                       }
                     },
-                    'normalized' => 'numbered-sub3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'numbered-sub3'
                   },
                   'structure' => {
                     'node_up' => {}
@@ -3606,16 +3522,13 @@ $result_nodes{'sectioning_frames'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'section',
-                      'extra' => {
-                        'spaces_before_argument' => '  '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2,
                         'number' => '1.1'
                       }
                     },
-                    'normalized' => 'numbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'numbered'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -3665,50 +3578,43 @@ 
$result_nodes{'sectioning_frames'}{'structure'}{'node_next'} = $result_nodes{'se
 $result_menus{'sectioning_frames'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'First-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'First-node'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'unnumbered'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'unnumbered-sub',
-                'spaces_before_argument' => ' '
+                'normalized' => 'unnumbered-sub'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered-sub',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'numbered-sub'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumbered-sub2',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-sub2'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'numbered-sub2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub2'
                           },
                           'structure' => {
                             'menu_prev' => {},
@@ -3741,15 +3647,13 @@ $result_menus{'sectioning_frames'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'unnumbered2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'unnumbered2'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered-sub3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'numbered-sub3'
                   },
                   'structure' => {
                     'menu_up' => {},
@@ -3761,8 +3665,7 @@ $result_menus{'sectioning_frames'} = {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'numbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'numbered'
                   },
                   'structure' => {
                     'menu_prev' => {},
@@ -3788,29 +3691,25 @@ $result_menus{'sectioning_frames'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'between-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'between-node'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Second-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Second-node'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Third-node-unnumbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Third-node-unnumbered'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'Last-node-no-description',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'Last-node-no-description'
                       },
                       'structure' => {
                         'menu_prev' => {},
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl 
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 6e1f34f2cc..92398817c2 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -626,12 +626,10 @@ $result_sectioning{'top_node_up_explicit'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -642,12 +640,10 @@ $result_sectioning{'top_node_up_explicit'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -674,9 +670,7 @@ $result_nodes{'top_node_up_explicit'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -684,20 +678,10 @@ $result_nodes{'top_node_up_explicit'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -705,16 +689,13 @@ $result_nodes{'top_node_up_explicit'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap'
       },
       'structure' => {
         'node_up' => {}
@@ -754,15 +735,13 @@ 
$result_nodes{'top_node_up_explicit'}{'structure'}{'menu_child'}{'structure'}{'n
 $result_menus{'top_node_up_explicit'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl 
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index 1bc2fe2339..edef0ef036 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -514,12 +514,10 @@ $result_sectioning{'top_node_up_implicit'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -530,12 +528,10 @@ $result_sectioning{'top_node_up_implicit'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -562,9 +558,7 @@ $result_nodes{'top_node_up_implicit'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -572,20 +566,10 @@ $result_nodes{'top_node_up_implicit'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -593,16 +577,13 @@ $result_nodes{'top_node_up_implicit'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -619,15 +600,13 @@ 
$result_nodes{'top_node_up_implicit'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'top_node_up_implicit'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 1f268a58f9..a8db0bc010 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -776,12 +776,10 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -792,12 +790,10 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -824,9 +820,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -834,20 +828,10 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -855,16 +839,13 @@ $result_nodes{'two_footnotes_in_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -881,15 +862,13 @@ 
$result_nodes{'two_footnotes_in_nodes'}{'structure'}{'node_next'} = $result_node
 $result_menus{'two_footnotes_in_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
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 68bd1481f8..519a86af4d 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -776,12 +776,10 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -792,12 +790,10 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -824,9 +820,7 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -834,20 +828,10 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -855,16 +839,13 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -881,15 +862,13 @@ 
$result_nodes{'two_footnotes_in_nodes_separated'}{'structure'}{'node_next'} = $r
 $result_menus{'two_footnotes_in_nodes_separated'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index b498170385..0db697fcc4 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -1491,16 +1491,7 @@ $result_floats{'commands_in_flushright'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'type',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index e75befe5ec..a80fab3361 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -777,16 +777,14 @@ IDEOGRAPHIC SPACE: | |
 $result_nodes{'all_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'all_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index 8cce5cda1b..c8d9b01556 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -502,16 +502,14 @@ overlap。
 $result_nodes{'chinese_mixed_with_en'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'chinese_mixed_with_en'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 5cbffee56c..4887bcfe48 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -1020,12 +1020,10 @@ $result_sectioning{'japanese_utf8'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1036,12 +1034,10 @@ $result_sectioning{'japanese_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Preface',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Preface'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1057,12 +1053,10 @@ $result_sectioning{'japanese_utf8'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Introduction',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Introduction'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1094,9 +1088,7 @@ $result_nodes{'japanese_utf8'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1104,20 +1096,10 @@ $result_nodes{'japanese_utf8'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1125,16 +1107,13 @@ $result_nodes{'japanese_utf8'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Preface',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Preface'
       },
       'structure' => {
         'node_next' => {
@@ -1142,16 +1121,13 @@ $result_nodes{'japanese_utf8'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'Introduction',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Introduction'
           },
           'structure' => {
             'node_prev' => {},
@@ -1174,22 +1150,19 @@ 
$result_nodes{'japanese_utf8'}{'structure'}{'node_next'} = $result_nodes{'japane
 $result_menus{'japanese_utf8'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Preface',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Preface'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Introduction',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Introduction'
           },
           'structure' => {
             'menu_prev' => {},
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 ff29174111..bf8869bff9 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -2943,20 +2943,10 @@ $result_nodes{'line_passed_and_formats'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2977,8 +2967,7 @@ 
$result_nodes{'line_passed_and_formats'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'line_passed_and_formats'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index dc33291e1f..e836c68977 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -414,26 +414,20 @@ $result_sectioning{'no_empty_line_after_section'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
@@ -442,9 +436,7 @@ $result_sectioning{'no_empty_line_after_section'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.2',
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index b717f99e06..c675404396 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -150,16 +150,14 @@ NARROW NO-BREAK SPACE: 
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 $result_nodes{'non_break_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'non_break_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 73ba4423c5..e5a77e9d7f 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1753,8 +1753,7 @@ $result_sectioning{'quote_node_names'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -1768,12 +1767,10 @@ $result_sectioning{'quote_node_names'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'blah_003ablah',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'blah_003ablah'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1789,12 +1786,10 @@ $result_sectioning{'quote_node_names'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'blumpty_002efump',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'blumpty_002efump'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1811,12 +1806,10 @@ $result_sectioning{'quote_node_names'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'normal-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'normal-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1833,12 +1826,10 @@ $result_sectioning{'quote_node_names'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'secret_002cnode',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'secret_002cnode'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1886,20 +1877,10 @@ $result_nodes{'quote_node_names'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1907,16 +1888,13 @@ $result_nodes{'quote_node_names'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'blah_003ablah',
-        'spaces_before_argument' => ' '
+        'normalized' => 'blah_003ablah'
       },
       'structure' => {
         'node_next' => {
@@ -1924,16 +1902,13 @@ $result_nodes{'quote_node_names'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'blumpty_002efump',
-            'spaces_before_argument' => ' '
+            'normalized' => 'blumpty_002efump'
           },
           'structure' => {
             'node_next' => {
@@ -1941,16 +1916,13 @@ $result_nodes{'quote_node_names'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => 'normal-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'normal-node'
               },
               'structure' => {
                 'node_next' => {
@@ -1958,16 +1930,13 @@ $result_nodes{'quote_node_names'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 4
                       }
                     },
-                    'normalized' => 'secret_002cnode',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'secret_002cnode'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -2002,36 +1971,31 @@ 
$result_nodes{'quote_node_names'}{'structure'}{'node_next'} = $result_nodes{'quo
 $result_menus{'quote_node_names'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'blah_003ablah',
-        'spaces_before_argument' => ' '
+        'normalized' => 'blah_003ablah'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'blumpty_002efump',
-            'spaces_before_argument' => ' '
+            'normalized' => 'blumpty_002efump'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'normal-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'normal-node'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'secret_002cnode',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'secret_002cnode'
                   },
                   'structure' => {
                     'menu_prev' => {},
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index cde07fb652..8c54567ada 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -290,15 +290,6 @@ $result_floats{'caption_in_example'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index db3311a100..a6354d4c5f 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -355,16 +355,14 @@ Copying information.
 $result_nodes{'anchor_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 37b40d0271..48ffb3bbf5 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -390,16 +390,14 @@ Copying footnote.
 $result_nodes{'anchor_in_copying_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_in_copying_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 5a5cc5687f..4dc3386af0 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -295,9 +295,7 @@ $result_sectioning{'anchor_in_titlepage'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
@@ -311,16 +309,14 @@ 
$result_sectioning{'anchor_in_titlepage'}{'structure'}{'section_childs'}[0]{'str
 $result_nodes{'anchor_in_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_in_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 368a8bd124..03d36dea2d 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -295,9 +295,7 @@ $result_sectioning{'anchor_in_titlepage_titlepage'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
@@ -311,16 +309,14 @@ 
$result_sectioning{'anchor_in_titlepage_titlepage'}{'structure'}{'section_childs
 $result_nodes{'anchor_in_titlepage_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_in_titlepage_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 5c2dcc047a..aadf94195b 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -246,16 +246,14 @@ $result_texts{'format_in_titlepage'} = '
 $result_nodes{'format_in_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'format_in_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 5f13b3ab2c..2cc7f911fc 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -246,16 +246,14 @@ $result_texts{'format_in_titlepage_titlepage'} = '
 $result_nodes{'format_in_titlepage_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'format_in_titlepage_titlepage'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 454368750a..0a5fd75d92 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -507,12 +507,10 @@ $result_sectioning{'ref_in_copying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -523,12 +521,10 @@ $result_sectioning{'ref_in_copying'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'GFDL',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'GFDL'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -555,9 +551,7 @@ $result_nodes{'ref_in_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -565,20 +559,10 @@ $result_nodes{'ref_in_copying'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -586,16 +570,13 @@ $result_nodes{'ref_in_copying'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'GFDL',
-        'spaces_before_argument' => ' '
+        'normalized' => 'GFDL'
       },
       'structure' => {
         'node_prev' => {},
@@ -612,15 +593,13 @@ $result_nodes{'ref_in_copying'}{'structure'}{'node_next'} 
= $result_nodes{'ref_i
 $result_menus{'ref_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'GFDL',
-        'spaces_before_argument' => ' '
+        'normalized' => 'GFDL'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 67852f701f..ad95943a0c 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -249,11 +249,9 @@ $result_sectioning{'today_in_copying'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -270,23 +268,19 @@ $result_nodes{'today_in_copying'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'today_in_copying'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index be8d5219ac..794729089e 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -139,8 +139,7 @@ A comma in text, end.
 $result_nodes{'a_comma_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Commands',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Commands'
   },
   'structure' => {}
 };
@@ -148,8 +147,7 @@ $result_nodes{'a_comma_after_node'} = {
 $result_menus{'a_comma_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Commands',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Commands'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index 52906feefd..d6ccff083d 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -509,12 +509,10 @@ $result_sectioning{'anchor_in_footnote'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -525,12 +523,10 @@ $result_sectioning{'anchor_in_footnote'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -557,9 +553,7 @@ $result_nodes{'anchor_in_footnote'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -567,20 +561,10 @@ $result_nodes{'anchor_in_footnote'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -588,16 +572,13 @@ $result_nodes{'anchor_in_footnote'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -614,15 +595,13 @@ 
$result_nodes{'anchor_in_footnote'}{'structure'}{'node_next'} = $result_nodes{'a
 $result_menus{'anchor_in_footnote'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index 4c265c421d..d3984437d7 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -545,12 +545,10 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -561,12 +559,10 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -593,9 +589,7 @@ $result_nodes{'anchor_in_footnote_separate'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -603,20 +597,10 @@ $result_nodes{'anchor_in_footnote_separate'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -624,16 +608,13 @@ $result_nodes{'anchor_in_footnote_separate'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -650,15 +631,13 @@ 
$result_nodes{'anchor_in_footnote_separate'}{'structure'}{'node_next'} = $result
 $result_menus{'anchor_in_footnote_separate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index 714f0d802d..717d2caf5f 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -189,16 +189,14 @@ $result_texts{'anchor_zero'} = '
 $result_nodes{'anchor_zero'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'anchor_zero'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl 
b/tp/t/results/sectioning/at_commands_in_node.pl
index 64bdd1ad39..36d57a1a79 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -372,8 +372,7 @@ $result_texts{'at_commands_in_node'} = '';
 $result_nodes{'at_commands_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-    'spaces_before_argument' => ' '
+    'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
   },
   'structure' => {}
 };
@@ -381,8 +380,7 @@ $result_nodes{'at_commands_in_node'} = {
 $result_menus{'at_commands_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1',
-    'spaces_before_argument' => ' '
+    'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index c4c35b6ad8..25d8db0e9d 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -215,9 +215,7 @@ $result_sectioning{'chapter_before_and_after_part'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -234,8 +232,7 @@ $result_sectioning{'chapter_before_and_after_part'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {
-                            'part_associated_section' => {},
-                            'spaces_before_argument' => ' '
+                            'part_associated_section' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -245,8 +242,7 @@ $result_sectioning{'chapter_before_and_after_part'} = {
                             ],
                             'section_up' => {}
                           }
-                        },
-                        'spaces_before_argument' => ' '
+                        }
                       },
                       'structure' => {
                         'associated_unit' => {},
@@ -315,9 +311,7 @@ $result_elements{'chapter_before_and_after_part'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1,
@@ -335,15 +329,12 @@ $result_elements{'chapter_before_and_after_part'} = [
               'extra' => {
                 'associated_part' => {
                   'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'level' => 0
                   }
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'associated_unit' => {},
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index ca94ba986b..86bc0b3c40 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -136,9 +136,7 @@ $result_sectioning{'chapter_before_part'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -151,9 +149,7 @@ $result_sectioning{'chapter_before_part'} = {
                   'extra' => {
                     'section' => {
                       'cmdname' => 'part',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 0,
@@ -220,9 +216,7 @@ $result_elements{'chapter_before_part'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1,
@@ -237,9 +231,7 @@ $result_elements{'chapter_before_part'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'part',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 0
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 69cb034a51..e5b4351da4 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -560,21 +560,17 @@ $result_sectioning{'chapter_between_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -585,12 +581,10 @@ $result_sectioning{'chapter_between_nodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-node',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-node'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -622,9 +616,7 @@ $result_nodes{'chapter_between_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -632,20 +624,10 @@ $result_nodes{'chapter_between_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -653,16 +635,13 @@ $result_nodes{'chapter_between_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'section',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2,
             'number' => '1.1'
           }
         },
-        'normalized' => 'section-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'section-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -679,15 +658,13 @@ 
$result_nodes{'chapter_between_nodes'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'chapter_between_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'section-node'
       },
       'structure' => {
         'menu_up' => {},
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 1aae9f1c1f..bca6bd9d72 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
@@ -433,12 +433,10 @@ $result_sectioning{'chapter_node_before_and_after_part'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -455,13 +453,11 @@ $result_sectioning{'chapter_node_before_and_after_part'} 
= {
               'associated_node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'after',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'after'
                 },
                 'structure' => {}
               },
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -469,8 +465,7 @@ $result_sectioning{'chapter_node_before_and_after_part'} = {
               'section_up' => {},
               'toplevel_prev' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -495,9 +490,7 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1,
         'number' => 1
@@ -506,20 +499,10 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -530,22 +513,18 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
           'extra' => {
             'associated_part' => {
               'cmdname' => 'part',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 0
               }
-            },
-            'spaces_before_argument' => ' '
+            }
           },
           'structure' => {
             'level' => 1,
             'number' => 2
           }
         },
-        'normalized' => 'after',
-        'spaces_before_argument' => ' '
+        'normalized' => 'after'
       },
       'structure' => {
         'node_prev' => {},
@@ -562,15 +541,13 @@ 
$result_nodes{'chapter_node_before_and_after_part'}{'structure'}{'node_next'} =
 $result_menus{'chapter_node_before_and_after_part'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'after',
-        'spaces_before_argument' => ' '
+        'normalized' => 'after'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/chapter_sections.pl 
b/tp/t/results/sectioning/chapter_sections.pl
index 4f331ddebf..13265e30ab 100644
--- a/tp/t/results/sectioning/chapter_sections.pl
+++ b/tp/t/results/sectioning/chapter_sections.pl
@@ -484,9 +484,7 @@ $result_sectioning{'chapter_sections'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -499,9 +497,7 @@ $result_sectioning{'chapter_sections'} = {
                   'extra' => {
                     'section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -509,9 +505,7 @@ $result_sectioning{'chapter_sections'} = {
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -526,9 +520,7 @@ $result_sectioning{'chapter_sections'} = {
                                       'extra' => {
                                         'section' => {
                                           'cmdname' => 'chapter',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'associated_unit' => {},
                                             'level' => 1,
@@ -536,9 +528,7 @@ $result_sectioning{'chapter_sections'} = {
                                             'section_childs' => [
                                               {
                                                 'cmdname' => 'section',
-                                                'extra' => {
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                                'extra' => {},
                                                 'structure' => {
                                                   'associated_unit' => {
                                                     'extra' => {
@@ -553,9 +543,7 @@ $result_sectioning{'chapter_sections'} = {
                                                           'extra' => {
                                                             'section' => {
                                                               'cmdname' => 
'chapter',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 'level' => 1,
@@ -573,18 +561,14 @@ $result_sectioning{'chapter_sections'} = {
                                                                 'extra' => {
                                                                   'section' => 
{
                                                                     'cmdname' 
=> 'subsection',
-                                                                    'extra' => 
{
-                                                                      
'spaces_before_argument' => ' '
-                                                                    },
+                                                                    'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       'level' 
=> 3,
                                                                       'number' 
=> '2.1.2',
                                                                       
'section_prev' => {
                                                                         
'cmdname' => 'subsection',
-                                                                        
'extra' => {
-                                                                          
'spaces_before_argument' => ' '
-                                                                        },
+                                                                        
'extra' => {},
                                                                         
'structure' => {
                                                                           
'associated_unit' => {
                                                                             
'extra' => {
@@ -840,9 +824,7 @@ $result_elements{'chapter_sections'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1
@@ -856,9 +838,7 @@ $result_elements{'chapter_sections'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
@@ -875,9 +855,7 @@ $result_elements{'chapter_sections'} = [
                 'extra' => {
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -892,9 +870,7 @@ $result_elements{'chapter_sections'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'section',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 2,
@@ -920,9 +896,7 @@ $result_elements{'chapter_sections'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -937,9 +911,7 @@ $result_elements{'chapter_sections'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'subsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 3,
@@ -954,9 +926,7 @@ $result_elements{'chapter_sections'} = [
                                   'extra' => {
                                     'section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 3,
@@ -971,9 +941,7 @@ $result_elements{'chapter_sections'} = [
                                         'extra' => {
                                           'section' => {
                                             'cmdname' => 'section',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
+                                            'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'level' => 2,
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index adf3980d36..e5ef54b808 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -501,36 +501,31 @@ $result_texts{'character_and_spaces_in_node'} = '
 $result_nodes{'character_and_spaces_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -563,8 +558,7 @@ 
$result_nodes{'character_and_spaces_in_node'}{'structure'}{'node_next'}{'structu
 $result_menus{'character_and_spaces_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 34cb427719..890ebfa128 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -1688,12 +1688,10 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1704,12 +1702,10 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'other-nodes',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'other-nodes'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1736,9 +1732,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1746,20 +1740,10 @@ $result_nodes{'character_and_spaces_in_refs'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1767,9 +1751,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1778,41 +1760,28 @@ $result_nodes{'character_and_spaces_in_refs'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'node_prev' => {},
@@ -1849,36 +1818,31 @@ 
$result_nodes{'character_and_spaces_in_refs'}{'structure'}{'node_next'} = $resul
 $result_menus{'character_and_spaces_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'other-nodes',
-        'spaces_before_argument' => ' '
+        'normalized' => 'other-nodes'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-            'spaces_before_argument' => ' '
+            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                'spaces_before_argument' => ' '
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
               },
               'structure' => {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'local-node',
-                    'spaces_before_argument' => '  '
+                    'normalized' => 'local-node'
                   },
                   'structure' => {
                     'menu_prev' => {},
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 72690f406e..a4cbebc444 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
@@ -1765,8 +1765,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -1782,8 +1781,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'other-nodes',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'other-nodes'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -1792,8 +1790,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1815,8 +1812,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -1833,8 +1829,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                                     'node' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                       },
                                       'structure' => {
                                         'associated_unit' => {}
@@ -1851,8 +1846,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                                           'node' => {
                                             'cmdname' => 'node',
                                             'extra' => {
-                                              'normalized' => 'local-node',
-                                              'spaces_before_argument' => '  '
+                                              'normalized' => 'local-node'
                                             },
                                             'structure' => {
                                               'associated_unit' => {}
@@ -1921,8 +1915,7 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -2005,9 +1998,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -2024,9 +2015,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
@@ -2036,28 +2025,17 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                       'menus' => [
                         {
                           'cmdname' => 'menu',
-                          'extra' => {
-                            'end_command' => {
-                              'cmdname' => 'end',
-                              'extra' => {
-                                'command_argument' => 'menu',
-                                'spaces_before_argument' => ' ',
-                                'text_arg' => 'menu'
-                              }
-                            }
-                          }
+                          'extra' => {}
                         }
                       ],
-                      'normalized' => 'other-nodes',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'other-nodes'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'menu_child' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                         },
                         'structure' => {
                           'associated_unit' => {
@@ -2074,16 +2052,14 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                                     'node' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                       },
                                       'structure' => {
                                         'associated_unit' => {},
                                         'node_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 'local-node',
-                                            'spaces_before_argument' => '  '
+                                            'normalized' => 'local-node'
                                           },
                                           'structure' => {
                                             'associated_unit' => {
@@ -2190,20 +2166,10 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -2287,8 +2253,7 @@ 
$result_nodes{'character_and_spaces_in_refs_out'}{'structure'}{'node_next'} = $r
 $result_menus{'character_and_spaces_in_refs_out'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -2296,9 +2261,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -2313,16 +2276,14 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'other-nodes',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'other-nodes'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_child' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -2339,16 +2300,14 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
                                 'node' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                                   },
                                   'structure' => {
                                     'associated_unit' => {},
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'local-node',
-                                        'spaces_before_argument' => '  '
+                                        'normalized' => 'local-node'
                                       },
                                       'structure' => {
                                         'associated_unit' => {
@@ -2430,9 +2389,7 @@ $result_menus{'character_and_spaces_in_refs_out'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -2550,16 +2507,14 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'other-nodes',
-              'spaces_before_argument' => ' '
+              'normalized' => 'other-nodes'
             },
             'structure' => {
               'associated_unit' => {
@@ -2567,9 +2522,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -2587,16 +2540,14 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                           },
                           'structure' => {
                             'associated_unit' => {},
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
                               },
                               'structure' => {
                                 'associated_unit' => {
@@ -2613,8 +2564,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                                           'node' => {
                                             'cmdname' => 'node',
                                             'extra' => {
-                                              'normalized' => 'local-node',
-                                              'spaces_before_argument' => '  '
+                                              'normalized' => 'local-node'
                                             },
                                             'structure' => {
                                               'associated_unit' => {},
@@ -2703,9 +2653,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index 5d271eba15..a9349cf569 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -3301,8 +3301,7 @@ $result_sectioning{'complex'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -3318,8 +3317,7 @@ $result_sectioning{'complex'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'First-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'First-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -3328,8 +3326,7 @@ $result_sectioning{'complex'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -3342,8 +3339,7 @@ $result_sectioning{'complex'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 'unnumbered',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 'unnumbered'
                                     },
                                     'structure' => {
                                       'associated_unit' => {
@@ -3361,8 +3357,7 @@ $result_sectioning{'complex'} = {
                                                 'node' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'Second-node',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'Second-node'
                                                   },
                                                   'structure' => {
                                                     'associated_unit' => {}
@@ -3371,8 +3366,7 @@ $result_sectioning{'complex'} = {
                                                 'section' => {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {
-                                                    'associated_node' => {},
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'associated_node' => {}
                                                   },
                                                   'structure' => {
                                                     'associated_unit' => {},
@@ -3393,8 +3387,7 @@ $result_sectioning{'complex'} = {
                                                       'node' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'numbered',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'numbered'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{}
@@ -3403,8 +3396,7 @@ $result_sectioning{'complex'} = {
                                                       'section' => {
                                                         'cmdname' => 'section',
                                                         'extra' => {
-                                                          'associated_node' => 
{},
-                                                          
'spaces_before_argument' => '  '
+                                                          'associated_node' => 
{}
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
@@ -3416,8 +3408,7 @@ $result_sectioning{'complex'} = {
                                                               
'associated_node' => {
                                                                 'cmdname' => 
'node',
                                                                 'extra' => {
-                                                                  'normalized' 
=> 'unnumbered2',
-                                                                  
'spaces_before_argument' => ' '
+                                                                  'normalized' 
=> 'unnumbered2'
                                                                 },
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {
@@ -3433,8 +3424,7 @@ $result_sectioning{'complex'} = {
                                                                             
'node' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
-                                                                               
 'normalized' => 'numbered-sub2',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'numbered-sub2'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {}
@@ -3443,8 +3433,7 @@ $result_sectioning{'complex'} = {
                                                                             
'section' => {
                                                                               
'cmdname' => 'subsection',
                                                                               
'extra' => {
-                                                                               
 'associated_node' => {},
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'associated_node' => {}
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {},
@@ -3455,8 +3444,7 @@ $result_sectioning{'complex'} = {
                                                                                
     'associated_node' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
-                                                                               
         'normalized' => 'unnumbered-sub2',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'unnumbered-sub2'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'associated_unit' => {
@@ -3472,8 +3460,7 @@ $result_sectioning{'complex'} = {
                                                                                
                   'node' => {
                                                                                
                     'cmdname' => 'node',
                                                                                
                     'extra' => {
-                                                                               
                       'normalized' => 'numbered-sub',
-                                                                               
                       'spaces_before_argument' => ' '
+                                                                               
                       'normalized' => 'numbered-sub'
                                                                                
                     },
                                                                                
                     'structure' => {
                                                                                
                       'associated_unit' => {}
@@ -3482,8 +3469,7 @@ $result_sectioning{'complex'} = {
                                                                                
                   'section' => {
                                                                                
                     'cmdname' => 'subsection',
                                                                                
                     'extra' => {
-                                                                               
                       'associated_node' => {},
-                                                                               
                       'spaces_before_argument' => ' '
+                                                                               
                       'associated_node' => {}
                                                                                
                     },
                                                                                
                     'structure' => {
                                                                                
                       'associated_unit' => {},
@@ -3494,8 +3480,7 @@ $result_sectioning{'complex'} = {
                                                                                
                           'associated_node' => {
                                                                                
                             'cmdname' => 'node',
                                                                                
                             'extra' => {
-                                                                               
                               'normalized' => 'unnumbered-sub',
-                                                                               
                               'spaces_before_argument' => ' '
+                                                                               
                               'normalized' => 'unnumbered-sub'
                                                                                
                             },
                                                                                
                             'structure' => {
                                                                                
                               'associated_unit' => {
@@ -3524,8 +3509,7 @@ $result_sectioning{'complex'} = {
                                                                                
                                 'type' => 'unit'
                                                                                
                               }
                                                                                
                             }
-                                                                               
                           },
-                                                                               
                           'spaces_before_argument' => ' '
+                                                                               
                           }
                                                                                
                         },
                                                                                
                         'structure' => {
                                                                                
                           'associated_unit' => {},
@@ -3578,8 +3562,7 @@ $result_sectioning{'complex'} = {
                                                                                
           'type' => 'unit'
                                                                                
         }
                                                                                
       }
-                                                                               
     },
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     }
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {},
@@ -3619,8 +3602,7 @@ $result_sectioning{'complex'} = {
                                                                             
'node' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
-                                                                               
 'normalized' => 'numbered-sub3',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'numbered-sub3'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {}
@@ -3629,8 +3611,7 @@ $result_sectioning{'complex'} = {
                                                                             
'section' => {
                                                                               
'cmdname' => 'subsection',
                                                                               
'extra' => {
-                                                                               
 'associated_node' => {},
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'associated_node' => {}
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {},
@@ -3673,8 +3654,7 @@ $result_sectioning{'complex'} = {
                                                                     'type' => 
'unit'
                                                                   }
                                                                 }
-                                                              },
-                                                              
'spaces_before_argument' => ' '
+                                                              }
                                                             },
                                                             'structure' => {
                                                               
'associated_unit' => {},
@@ -3715,8 +3695,7 @@ $result_sectioning{'complex'} = {
                                                       'node' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'Third-node-unnumbered',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'Third-node-unnumbered'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{}
@@ -3725,8 +3704,7 @@ $result_sectioning{'complex'} = {
                                                       'section' => {
                                                         'cmdname' => 
'unnumbered',
                                                         'extra' => {
-                                                          'associated_node' => 
{},
-                                                          
'spaces_before_argument' => ' '
+                                                          'associated_node' => 
{}
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
@@ -3748,8 +3726,7 @@ $result_sectioning{'complex'} = {
                                                             'node' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> 'continuity',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> 'continuity'
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {}
@@ -3758,8 +3735,7 @@ $result_sectioning{'complex'} = {
                                                             'section' => {
                                                               'cmdname' => 
'unnumbered',
                                                               'extra' => {
-                                                                
'associated_node' => {},
-                                                                
'spaces_before_argument' => ' '
+                                                                
'associated_node' => {}
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {},
@@ -3834,8 +3810,7 @@ $result_sectioning{'complex'} = {
                                         'type' => 'unit'
                                       }
                                     }
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -3882,13 +3857,7 @@ $result_sectioning{'complex'} = {
                     'NodeForward' => {},
                     'NodeNext' => {},
                     'NodePrev' => {
-                      'extra' => {
-                        'manual_content' => [
-                          {
-                            'text' => 'dir'
-                          }
-                        ]
-                      },
+                      'extra' => {},
                       'type' => 'external_node'
                     },
                     'This' => {}
@@ -4184,9 +4153,7 @@ $result_nodes{'complex'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
@@ -4196,20 +4163,10 @@ $result_nodes{'complex'} = {
                       'menus' => [
                         {
                           'cmdname' => 'menu',
-                          'extra' => {
-                            'end_command' => {
-                              'cmdname' => 'end',
-                              'extra' => {
-                                'command_argument' => 'menu',
-                                'spaces_before_argument' => ' ',
-                                'text_arg' => 'menu'
-                              }
-                            }
-                          }
+                          'extra' => {}
                         }
                       ],
-                      'normalized' => 'First-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'First-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -4218,9 +4175,7 @@ $result_nodes{'complex'} = {
                         'extra' => {
                           'associated_section' => {
                             'cmdname' => 'unnumberedsec',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -4239,17 +4194,14 @@ $result_nodes{'complex'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 1,
                                                 'number' => 2
                                               }
                                             },
-                                            'normalized' => 'Second-node',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'Second-node'
                                           },
                                           'structure' => {
                                             'associated_unit' => {},
@@ -4258,9 +4210,7 @@ $result_nodes{'complex'} = {
                                               'extra' => {
                                                 'associated_section' => {
                                                   'cmdname' => 'unnumbered',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {
                                                       'extra' => {
@@ -4279,16 +4229,13 @@ $result_nodes{'complex'} = {
                                                                 'extra' => {
                                                                   
'associated_section' => {
                                                                     'cmdname' 
=> 'unnumbered',
-                                                                    'extra' => 
{
-                                                                      
'spaces_before_argument' => ' '
-                                                                    },
+                                                                    'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       'level' 
=> 1
                                                                     }
                                                                   },
-                                                                  'normalized' 
=> 'continuity',
-                                                                  
'spaces_before_argument' => ' '
+                                                                  'normalized' 
=> 'continuity'
                                                                 },
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
@@ -4296,8 +4243,7 @@ $result_nodes{'complex'} = {
                                                                   'node_prev' 
=> {
                                                                     'cmdname' 
=> 'node',
                                                                     'extra' => 
{
-                                                                      
'normalized' => 'Last-node-no-description',
-                                                                      
'spaces_before_argument' => ' '
+                                                                      
'normalized' => 'Last-node-no-description'
                                                                     },
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
@@ -4347,8 +4293,7 @@ $result_nodes{'complex'} = {
                                                     'level' => 1
                                                   }
                                                 },
-                                                'normalized' => 
'Third-node-unnumbered',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'Third-node-unnumbered'
                                               },
                                               'structure' => {
                                                 'associated_unit' => {},
@@ -4372,17 +4317,14 @@ $result_nodes{'complex'} = {
                                                 'extra' => {
                                                   'associated_section' => {
                                                     'cmdname' => 'section',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> '  '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'level' => 2,
                                                       'number' => '1.1'
                                                     }
                                                   },
-                                                  'normalized' => 'numbered',
-                                                  'spaces_before_argument' => 
' '
+                                                  'normalized' => 'numbered'
                                                 },
                                                 'structure' => {
                                                   'associated_unit' => {},
@@ -4391,9 +4333,7 @@ $result_nodes{'complex'} = {
                                                     'extra' => {
                                                       'associated_section' => {
                                                         'cmdname' => 
'unnumberedsec',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
+                                                        'extra' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{
                                                             'extra' => {
@@ -4410,16 +4350,13 @@ $result_nodes{'complex'} = {
                                                                       'extra' 
=> {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'subsection',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
                                                                             
'level' => 3
                                                                           }
                                                                         },
-                                                                        
'normalized' => 'numbered-sub2',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'numbered-sub2'
                                                                       },
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
@@ -4428,9 +4365,7 @@ $result_nodes{'complex'} = {
                                                                           
'extra' => {
                                                                             
'associated_section' => {
                                                                               
'cmdname' => 'unnumberedsubsec',
-                                                                              
'extra' => {
-                                                                               
 'spaces_before_argument' => ' '
-                                                                              
},
+                                                                              
'extra' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {
                                                                                
   'extra' => {
@@ -4447,16 +4382,13 @@ $result_nodes{'complex'} = {
                                                                                
             'extra' => {
                                                                                
               'associated_section' => {
                                                                                
                 'cmdname' => 'subsection',
-                                                                               
                 'extra' => {
-                                                                               
                   'spaces_before_argument' => ' '
-                                                                               
                 },
+                                                                               
                 'extra' => {},
                                                                                
                 'structure' => {
                                                                                
                   'associated_unit' => {},
                                                                                
                   'level' => 3
                                                                                
                 }
                                                                                
               },
-                                                                               
               'normalized' => 'numbered-sub',
-                                                                               
               'spaces_before_argument' => ' '
+                                                                               
               'normalized' => 'numbered-sub'
                                                                                
             },
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {},
@@ -4466,9 +4398,7 @@ $result_nodes{'complex'} = {
                                                                                
                 'extra' => {
                                                                                
                   'associated_section' => {
                                                                                
                     'cmdname' => 'unnumberedsubsec',
-                                                                               
                     'extra' => {
-                                                                               
                       'spaces_before_argument' => ' '
-                                                                               
                     },
+                                                                               
                     'extra' => {},
                                                                                
                     'structure' => {
                                                                                
                       'associated_unit' => {
                                                                                
                         'extra' => {
@@ -4498,8 +4428,7 @@ $result_nodes{'complex'} = {
                                                                                
                       'level' => 3
                                                                                
                     }
                                                                                
                   },
-                                                                               
                   'normalized' => 'unnumbered-sub',
-                                                                               
                   'spaces_before_argument' => ' '
+                                                                               
                   'normalized' => 'unnumbered-sub'
                                                                                
                 },
                                                                                
                 'structure' => {
                                                                                
                   'associated_unit' => {},
@@ -4555,8 +4484,7 @@ $result_nodes{'complex'} = {
                                                                                
 'level' => 3
                                                                               }
                                                                             },
-                                                                            
'normalized' => 'unnumbered-sub2',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'unnumbered-sub2'
                                                                           },
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
@@ -4599,16 +4527,13 @@ $result_nodes{'complex'} = {
                                                                       'extra' 
=> {
                                                                         
'associated_section' => {
                                                                           
'cmdname' => 'subsection',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
                                                                             
'level' => 3
                                                                           }
                                                                         },
-                                                                        
'normalized' => 'numbered-sub3',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'numbered-sub3'
                                                                       },
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
@@ -4656,20 +4581,10 @@ $result_nodes{'complex'} = {
                                                       'menus' => [
                                                         {
                                                           'cmdname' => 'menu',
-                                                          'extra' => {
-                                                            'end_command' => {
-                                                              'cmdname' => 
'end',
-                                                              'extra' => {
-                                                                
'command_argument' => 'menu',
-                                                                
'spaces_before_argument' => ' ',
-                                                                'text_arg' => 
'menu'
-                                                              }
-                                                            }
-                                                          }
+                                                          'extra' => {}
                                                         }
                                                       ],
-                                                      'normalized' => 
'unnumbered2',
-                                                      'spaces_before_argument' 
=> ' '
+                                                      'normalized' => 
'unnumbered2'
                                                     },
                                                     'structure' => {
                                                       'associated_unit' => {},
@@ -4739,20 +4654,10 @@ $result_nodes{'complex'} = {
                           'menus' => [
                             {
                               'cmdname' => 'menu',
-                              'extra' => {
-                                'end_command' => {
-                                  'cmdname' => 'end',
-                                  'extra' => {
-                                    'command_argument' => 'menu',
-                                    'spaces_before_argument' => ' ',
-                                    'text_arg' => 'menu'
-                                  }
-                                }
-                              }
+                              'extra' => {}
                             }
                           ],
-                          'normalized' => 'unnumbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumbered'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -4812,20 +4717,10 @@ $result_nodes{'complex'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -5083,8 +4978,7 @@ 
$result_nodes{'complex'}{'structure'}{'node_prev'}{'extra'}{'manual_content'} =
 $result_menus{'complex'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -5107,16 +5001,14 @@ $result_menus{'complex'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'First-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'First-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_child' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'unnumbered',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'unnumbered'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -5124,9 +5016,7 @@ $result_menus{'complex'} = {
                           'node' => {},
                           'section' => {
                             'cmdname' => 'unnumberedsec',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 2
@@ -5143,16 +5033,14 @@ $result_menus{'complex'} = {
                                 'node' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'Second-node',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'Second-node'
                                   },
                                   'structure' => {
                                     'associated_unit' => {},
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'Third-node-unnumbered',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'Third-node-unnumbered'
                                       },
                                       'structure' => {
                                         'associated_unit' => {
@@ -5160,9 +5048,7 @@ $result_menus{'complex'} = {
                                             'node' => {},
                                             'section' => {
                                               'cmdname' => 'unnumbered',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 1
@@ -5179,16 +5065,14 @@ $result_menus{'complex'} = {
                                                   'node' => {
                                                     'cmdname' => 'node',
                                                     'extra' => {
-                                                      'normalized' => 
'continuity',
-                                                      'spaces_before_argument' 
=> ' '
+                                                      'normalized' => 
'continuity'
                                                     },
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'menu_next' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'Last-node-no-description',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'Last-node-no-description'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
@@ -5208,9 +5092,7 @@ $result_menus{'complex'} = {
                                                   },
                                                   'section' => {
                                                     'cmdname' => 'unnumbered',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'level' => 1
@@ -5262,8 +5144,7 @@ $result_menus{'complex'} = {
                                     'menu_prev' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'between-node',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'between-node'
                                       },
                                       'structure' => {
                                         'associated_unit' => {
@@ -5271,16 +5152,14 @@ $result_menus{'complex'} = {
                                             'node' => {
                                               'cmdname' => 'node',
                                               'extra' => {
-                                                'normalized' => 'numbered',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 'numbered'
                                               },
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'menu_prev' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'unnumbered2',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'unnumbered2'
                                                   },
                                                   'structure' => {
                                                     'associated_unit' => {
@@ -5288,9 +5167,7 @@ $result_menus{'complex'} = {
                                                         'node' => {},
                                                         'section' => {
                                                           'cmdname' => 
'unnumberedsec',
-                                                          'extra' => {
-                                                            
'spaces_before_argument' => ' '
-                                                          },
+                                                          'extra' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
                                                             'level' => 2
@@ -5305,16 +5182,14 @@ $result_menus{'complex'} = {
                                                               'node' => {
                                                                 'cmdname' => 
'node',
                                                                 'extra' => {
-                                                                  'normalized' 
=> 'numbered-sub2',
-                                                                  
'spaces_before_argument' => ' '
+                                                                  'normalized' 
=> 'numbered-sub2'
                                                                 },
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
                                                                   'menu_prev' 
=> {
                                                                     'cmdname' 
=> 'node',
                                                                     'extra' => 
{
-                                                                      
'normalized' => 'unnumbered-sub2',
-                                                                      
'spaces_before_argument' => ' '
+                                                                      
'normalized' => 'unnumbered-sub2'
                                                                     },
                                                                     
'structure' => {
                                                                       
'associated_unit' => {
@@ -5322,9 +5197,7 @@ $result_menus{'complex'} = {
                                                                           
'node' => {},
                                                                           
'section' => {
                                                                             
'cmdname' => 'unnumberedsubsec',
-                                                                            
'extra' => {
-                                                                              
'spaces_before_argument' => ' '
-                                                                            },
+                                                                            
'extra' => {},
                                                                             
'structure' => {
                                                                               
'associated_unit' => {},
                                                                               
'level' => 3
@@ -5339,8 +5212,7 @@ $result_menus{'complex'} = {
                                                                                
 'node' => {
                                                                                
   'cmdname' => 'node',
                                                                                
   'extra' => {
-                                                                               
     'normalized' => 'numbered-sub',
-                                                                               
     'spaces_before_argument' => ' '
+                                                                               
     'normalized' => 'numbered-sub'
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {},
@@ -5348,8 +5220,7 @@ $result_menus{'complex'} = {
                                                                                
     'menu_prev' => {
                                                                                
       'cmdname' => 'node',
                                                                                
       'extra' => {
-                                                                               
         'normalized' => 'unnumbered-sub',
-                                                                               
         'spaces_before_argument' => ' '
+                                                                               
         'normalized' => 'unnumbered-sub'
                                                                                
       },
                                                                                
       'structure' => {
                                                                                
         'associated_unit' => {
@@ -5357,9 +5228,7 @@ $result_menus{'complex'} = {
                                                                                
             'node' => {},
                                                                                
             'section' => {
                                                                                
               'cmdname' => 'unnumberedsubsec',
-                                                                               
               'extra' => {
-                                                                               
                 'spaces_before_argument' => ' '
-                                                                               
               },
+                                                                               
               'extra' => {},
                                                                                
               'structure' => {
                                                                                
                 'associated_unit' => {},
                                                                                
                 'level' => 3
@@ -5401,9 +5270,7 @@ $result_menus{'complex'} = {
                                                                                
 },
                                                                                
 'section' => {
                                                                                
   'cmdname' => 'subsection',
-                                                                               
   'extra' => {
-                                                                               
     'spaces_before_argument' => ' '
-                                                                               
   },
+                                                                               
   'extra' => {},
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {},
                                                                                
     'level' => 3
@@ -5466,9 +5333,7 @@ $result_menus{'complex'} = {
                                                               },
                                                               'section' => {
                                                                 'cmdname' => 
'subsection',
-                                                                'extra' => {
-                                                                  
'spaces_before_argument' => ' '
-                                                                },
+                                                                'extra' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
                                                                   'level' => 3
@@ -5502,8 +5367,7 @@ $result_menus{'complex'} = {
                                                               'node' => {
                                                                 'cmdname' => 
'node',
                                                                 'extra' => {
-                                                                  'normalized' 
=> 'numbered-sub3',
-                                                                  
'spaces_before_argument' => ' '
+                                                                  'normalized' 
=> 'numbered-sub3'
                                                                 },
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
@@ -5515,9 +5379,7 @@ $result_menus{'complex'} = {
                                                               },
                                                               'section' => {
                                                                 'cmdname' => 
'subsection',
-                                                                'extra' => {
-                                                                  
'spaces_before_argument' => ' '
-                                                                },
+                                                                'extra' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
                                                                   'level' => 3
@@ -5574,9 +5436,7 @@ $result_menus{'complex'} = {
                                             },
                                             'section' => {
                                               'cmdname' => 'section',
-                                              'extra' => {
-                                                'spaces_before_argument' => '  
'
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 2,
@@ -5619,9 +5479,7 @@ $result_menus{'complex'} = {
                                 },
                                 'section' => {
                                   'cmdname' => 'chapter',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'associated_unit' => {},
                                     'level' => 1,
@@ -5680,9 +5538,7 @@ $result_menus{'complex'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -5975,16 +5831,14 @@ $result_elements{'complex'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'First-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'First-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -5992,9 +5846,7 @@ $result_elements{'complex'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -6012,16 +5864,14 @@ $result_elements{'complex'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'Second-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'Second-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'Third-node-unnumbered',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'Third-node-unnumbered'
                               },
                               'structure' => {
                                 'associated_unit' => {
@@ -6029,9 +5879,7 @@ $result_elements{'complex'} = [
                                     'node' => {},
                                     'section' => {
                                       'cmdname' => 'unnumbered',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 1
@@ -6048,16 +5896,14 @@ $result_elements{'complex'} = [
                                           'node' => {
                                             'cmdname' => 'node',
                                             'extra' => {
-                                              'normalized' => 'continuity',
-                                              'spaces_before_argument' => ' '
+                                              'normalized' => 'continuity'
                                             },
                                             'structure' => {
                                               'associated_unit' => {},
                                               'menu_next' => {
                                                 'cmdname' => 'node',
                                                 'extra' => {
-                                                  'normalized' => 
'Last-node-no-description',
-                                                  'spaces_before_argument' => 
' '
+                                                  'normalized' => 
'Last-node-no-description'
                                                 },
                                                 'structure' => {
                                                   'associated_unit' => {},
@@ -6077,9 +5923,7 @@ $result_elements{'complex'} = [
                                           },
                                           'section' => {
                                             'cmdname' => 'unnumbered',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
+                                            'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'level' => 1
@@ -6128,8 +5972,7 @@ $result_elements{'complex'} = [
                             'menu_prev' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'between-node',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'between-node'
                               },
                               'structure' => {
                                 'associated_unit' => {
@@ -6137,16 +5980,14 @@ $result_elements{'complex'} = [
                                     'node' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'numbered',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'numbered'
                                       },
                                       'structure' => {
                                         'associated_unit' => {},
                                         'menu_prev' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 'unnumbered2',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'unnumbered2'
                                           },
                                           'structure' => {
                                             'associated_unit' => {
@@ -6154,9 +5995,7 @@ $result_elements{'complex'} = [
                                                 'node' => {},
                                                 'section' => {
                                                   'cmdname' => 'unnumberedsec',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
                                                     'level' => 2
@@ -6171,16 +6010,14 @@ $result_elements{'complex'} = [
                                                       'node' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'numbered-sub2',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'numbered-sub2'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
                                                           'menu_prev' => {
                                                             'cmdname' => 
'node',
                                                             'extra' => {
-                                                              'normalized' => 
'unnumbered-sub2',
-                                                              
'spaces_before_argument' => ' '
+                                                              'normalized' => 
'unnumbered-sub2'
                                                             },
                                                             'structure' => {
                                                               
'associated_unit' => {
@@ -6188,9 +6025,7 @@ $result_elements{'complex'} = [
                                                                   'node' => {},
                                                                   'section' => 
{
                                                                     'cmdname' 
=> 'unnumberedsubsec',
-                                                                    'extra' => 
{
-                                                                      
'spaces_before_argument' => ' '
-                                                                    },
+                                                                    'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       'level' 
=> 3
@@ -6205,8 +6040,7 @@ $result_elements{'complex'} = [
                                                                         'node' 
=> {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
-                                                                            
'normalized' => 'numbered-sub',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'numbered-sub'
                                                                           },
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
@@ -6214,8 +6048,7 @@ $result_elements{'complex'} = [
                                                                             
'menu_prev' => {
                                                                               
'cmdname' => 'node',
                                                                               
'extra' => {
-                                                                               
 'normalized' => 'unnumbered-sub',
-                                                                               
 'spaces_before_argument' => ' '
+                                                                               
 'normalized' => 'unnumbered-sub'
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {
@@ -6223,9 +6056,7 @@ $result_elements{'complex'} = [
                                                                                
     'node' => {},
                                                                                
     'section' => {
                                                                                
       'cmdname' => 'unnumberedsubsec',
-                                                                               
       'extra' => {
-                                                                               
         'spaces_before_argument' => ' '
-                                                                               
       },
+                                                                               
       'extra' => {},
                                                                                
       'structure' => {
                                                                                
         'associated_unit' => {},
                                                                                
         'level' => 3
@@ -6240,8 +6071,7 @@ $result_elements{'complex'} = [
                                                                                
           'node' => {
                                                                                
             'cmdname' => 'node',
                                                                                
             'extra' => {
-                                                                               
               'normalized' => 'unnumbered',
-                                                                               
               'spaces_before_argument' => ' '
+                                                                               
               'normalized' => 'unnumbered'
                                                                                
             },
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {},
@@ -6255,9 +6085,7 @@ $result_elements{'complex'} = [
                                                                                
           },
                                                                                
           'section' => {
                                                                                
             'cmdname' => 'unnumberedsec',
-                                                                               
             'extra' => {
-                                                                               
               'spaces_before_argument' => ' '
-                                                                               
             },
+                                                                               
             'extra' => {},
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {},
                                                                                
               'level' => 2
@@ -6311,9 +6139,7 @@ $result_elements{'complex'} = [
                                                                         },
                                                                         
'section' => {
                                                                           
'cmdname' => 'subsection',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
                                                                             
'level' => 3
@@ -6372,9 +6198,7 @@ $result_elements{'complex'} = [
                                                       },
                                                       'section' => {
                                                         'cmdname' => 
'subsection',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
+                                                        'extra' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
                                                           'level' => 3
@@ -6406,8 +6230,7 @@ $result_elements{'complex'} = [
                                                       'node' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'numbered-sub3',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'numbered-sub3'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
@@ -6419,9 +6242,7 @@ $result_elements{'complex'} = [
                                                       },
                                                       'section' => {
                                                         'cmdname' => 
'subsection',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
+                                                        'extra' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
                                                           'level' => 3
@@ -6474,9 +6295,7 @@ $result_elements{'complex'} = [
                                     },
                                     'section' => {
                                       'cmdname' => 'section',
-                                      'extra' => {
-                                        'spaces_before_argument' => '  '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 2,
@@ -6517,9 +6336,7 @@ $result_elements{'complex'} = [
                         },
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index becbf6def4..63d2834d9f 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -3323,8 +3323,7 @@ $result_sectioning{'complex_split_at_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -3340,8 +3339,7 @@ $result_sectioning{'complex_split_at_node'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'First-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'First-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -3350,8 +3348,7 @@ $result_sectioning{'complex_split_at_node'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -3364,8 +3361,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 'unnumbered',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 'unnumbered'
                                     },
                                     'structure' => {
                                       'associated_unit' => {
@@ -3383,8 +3379,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                 'node' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
-                                                    'normalized' => 
'Second-node',
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'normalized' => 
'Second-node'
                                                   },
                                                   'structure' => {
                                                     'associated_unit' => {}
@@ -3393,8 +3388,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                 'section' => {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {
-                                                    'associated_node' => {},
-                                                    'spaces_before_argument' 
=> ' '
+                                                    'associated_node' => {}
                                                   },
                                                   'structure' => {
                                                     'associated_unit' => {},
@@ -3415,8 +3409,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                       'node' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'between-node',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'between-node'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{}
@@ -3431,8 +3424,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                             'node' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> 'numbered',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> 'numbered'
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {}
@@ -3441,8 +3433,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                             'section' => {
                                                               'cmdname' => 
'section',
                                                               'extra' => {
-                                                                
'associated_node' => {},
-                                                                
'spaces_before_argument' => '  '
+                                                                
'associated_node' => {}
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {},
@@ -3454,8 +3445,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                     
'associated_node' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
-                                                                        
'normalized' => 'unnumbered2',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'unnumbered2'
                                                                       },
                                                                       
'structure' => {
                                                                         
'associated_unit' => {
@@ -3471,8 +3461,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
   'node' => {
                                                                                
     'cmdname' => 'node',
                                                                                
     'extra' => {
-                                                                               
       'normalized' => 'numbered-sub2',
-                                                                               
       'spaces_before_argument' => ' '
+                                                                               
       'normalized' => 'numbered-sub2'
                                                                                
     },
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {}
@@ -3481,8 +3470,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
   'section' => {
                                                                                
     'cmdname' => 'subsection',
                                                                                
     'extra' => {
-                                                                               
       'associated_node' => {},
-                                                                               
       'spaces_before_argument' => ' '
+                                                                               
       'associated_node' => {}
                                                                                
     },
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {},
@@ -3493,8 +3481,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
           'associated_node' => {
                                                                                
             'cmdname' => 'node',
                                                                                
             'extra' => {
-                                                                               
               'normalized' => 'unnumbered-sub2',
-                                                                               
               'spaces_before_argument' => ' '
+                                                                               
               'normalized' => 'unnumbered-sub2'
                                                                                
             },
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {
@@ -3510,8 +3497,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
                         'node' => {
                                                                                
                           'cmdname' => 'node',
                                                                                
                           'extra' => {
-                                                                               
                             'normalized' => 'numbered-sub',
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'normalized' => 'numbered-sub'
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'associated_unit' => {}
@@ -3520,8 +3506,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
                         'section' => {
                                                                                
                           'cmdname' => 'subsection',
                                                                                
                           'extra' => {
-                                                                               
                             'associated_node' => {},
-                                                                               
                             'spaces_before_argument' => ' '
+                                                                               
                             'associated_node' => {}
                                                                                
                           },
                                                                                
                           'structure' => {
                                                                                
                             'associated_unit' => {},
@@ -3532,8 +3517,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
                                 'associated_node' => {
                                                                                
                                   'cmdname' => 'node',
                                                                                
                                   'extra' => {
-                                                                               
                                     'normalized' => 'unnumbered-sub',
-                                                                               
                                     'spaces_before_argument' => ' '
+                                                                               
                                     'normalized' => 'unnumbered-sub'
                                                                                
                                   },
                                                                                
                                   'structure' => {
                                                                                
                                     'associated_unit' => {
@@ -3562,8 +3546,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
                                       'type' => 'unit'
                                                                                
                                     }
                                                                                
                                   }
-                                                                               
                                 },
-                                                                               
                                 'spaces_before_argument' => ' '
+                                                                               
                                 }
                                                                                
                               },
                                                                                
                               'structure' => {
                                                                                
                                 'associated_unit' => {},
@@ -3616,8 +3599,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
                 'type' => 'unit'
                                                                                
               }
                                                                                
             }
-                                                                               
           },
-                                                                               
           'spaces_before_argument' => ' '
+                                                                               
           }
                                                                                
         },
                                                                                
         'structure' => {
                                                                                
           'associated_unit' => {},
@@ -3657,8 +3639,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
   'node' => {
                                                                                
     'cmdname' => 'node',
                                                                                
     'extra' => {
-                                                                               
       'normalized' => 'numbered-sub3',
-                                                                               
       'spaces_before_argument' => ' '
+                                                                               
       'normalized' => 'numbered-sub3'
                                                                                
     },
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {}
@@ -3667,8 +3648,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                                
   'section' => {
                                                                                
     'cmdname' => 'subsection',
                                                                                
     'extra' => {
-                                                                               
       'associated_node' => {},
-                                                                               
       'spaces_before_argument' => ' '
+                                                                               
       'associated_node' => {}
                                                                                
     },
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {},
@@ -3711,8 +3691,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                           
'type' => 'unit'
                                                                         }
                                                                       }
-                                                                    },
-                                                                    
'spaces_before_argument' => ' '
+                                                                    }
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {},
@@ -3763,8 +3742,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                       'node' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'Third-node-unnumbered',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'Third-node-unnumbered'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{}
@@ -3773,8 +3751,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                       'section' => {
                                                         'cmdname' => 
'unnumbered',
                                                         'extra' => {
-                                                          'associated_node' => 
{},
-                                                          
'spaces_before_argument' => ' '
+                                                          'associated_node' => 
{}
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
@@ -3796,8 +3773,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                             'node' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> 'continuity',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> 'continuity'
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {}
@@ -3806,8 +3782,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                             'section' => {
                                                               'cmdname' => 
'unnumbered',
                                                               'extra' => {
-                                                                
'associated_node' => {},
-                                                                
'spaces_before_argument' => ' '
+                                                                
'associated_node' => {}
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {},
@@ -3829,8 +3804,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                                                   'node' => {
                                                                     'cmdname' 
=> 'node',
                                                                     'extra' => 
{
-                                                                      
'normalized' => 'Last-node-no-description',
-                                                                      
'spaces_before_argument' => ' '
+                                                                      
'normalized' => 'Last-node-no-description'
                                                                     },
                                                                     
'structure' => {
                                                                       
'associated_unit' => {}
@@ -3909,8 +3883,7 @@ $result_sectioning{'complex_split_at_node'} = {
                                         'type' => 'unit'
                                       }
                                     }
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -3957,13 +3930,7 @@ $result_sectioning{'complex_split_at_node'} = {
                     'NodeForward' => {},
                     'NodeNext' => {},
                     'NodePrev' => {
-                      'extra' => {
-                        'manual_content' => [
-                          {
-                            'text' => 'dir'
-                          }
-                        ]
-                      },
+                      'extra' => {},
                       'type' => 'external_node'
                     },
                     'This' => {}
@@ -4276,9 +4243,7 @@ $result_nodes{'complex_split_at_node'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
@@ -4288,20 +4253,10 @@ $result_nodes{'complex_split_at_node'} = {
                       'menus' => [
                         {
                           'cmdname' => 'menu',
-                          'extra' => {
-                            'end_command' => {
-                              'cmdname' => 'end',
-                              'extra' => {
-                                'command_argument' => 'menu',
-                                'spaces_before_argument' => ' ',
-                                'text_arg' => 'menu'
-                              }
-                            }
-                          }
+                          'extra' => {}
                         }
                       ],
-                      'normalized' => 'First-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'First-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -4310,9 +4265,7 @@ $result_nodes{'complex_split_at_node'} = {
                         'extra' => {
                           'associated_section' => {
                             'cmdname' => 'unnumberedsec',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -4331,17 +4284,14 @@ $result_nodes{'complex_split_at_node'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'chapter',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 1,
                                                 'number' => 2
                                               }
                                             },
-                                            'normalized' => 'Second-node',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'Second-node'
                                           },
                                           'structure' => {
                                             'associated_unit' => {},
@@ -4350,9 +4300,7 @@ $result_nodes{'complex_split_at_node'} = {
                                               'extra' => {
                                                 'associated_section' => {
                                                   'cmdname' => 'unnumbered',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {
                                                       'extra' => {
@@ -4371,16 +4319,13 @@ $result_nodes{'complex_split_at_node'} = {
                                                                 'extra' => {
                                                                   
'associated_section' => {
                                                                     'cmdname' 
=> 'unnumbered',
-                                                                    'extra' => 
{
-                                                                      
'spaces_before_argument' => ' '
-                                                                    },
+                                                                    'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       'level' 
=> 1
                                                                     }
                                                                   },
-                                                                  'normalized' 
=> 'continuity',
-                                                                  
'spaces_before_argument' => ' '
+                                                                  'normalized' 
=> 'continuity'
                                                                 },
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
@@ -4388,8 +4333,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                   'node_prev' 
=> {
                                                                     'cmdname' 
=> 'node',
                                                                     'extra' => 
{
-                                                                      
'normalized' => 'Last-node-no-description',
-                                                                      
'spaces_before_argument' => ' '
+                                                                      
'normalized' => 'Last-node-no-description'
                                                                     },
                                                                     
'structure' => {
                                                                       
'associated_unit' => {
@@ -4457,8 +4401,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                     'level' => 1
                                                   }
                                                 },
-                                                'normalized' => 
'Third-node-unnumbered',
-                                                'spaces_before_argument' => ' '
+                                                'normalized' => 
'Third-node-unnumbered'
                                               },
                                               'structure' => {
                                                 'associated_unit' => {},
@@ -4480,8 +4423,7 @@ $result_nodes{'complex_split_at_node'} = {
                                               'node' => {
                                                 'cmdname' => 'node',
                                                 'extra' => {
-                                                  'normalized' => 
'between-node',
-                                                  'spaces_before_argument' => 
' '
+                                                  'normalized' => 
'between-node'
                                                 },
                                                 'structure' => {
                                                   'associated_unit' => {},
@@ -4499,17 +4441,14 @@ $result_nodes{'complex_split_at_node'} = {
                                                       'extra' => {
                                                         'associated_section' 
=> {
                                                           'cmdname' => 
'section',
-                                                          'extra' => {
-                                                            
'spaces_before_argument' => '  '
-                                                          },
+                                                          'extra' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
                                                             'level' => 2,
                                                             'number' => '1.1'
                                                           }
                                                         },
-                                                        'normalized' => 
'numbered',
-                                                        
'spaces_before_argument' => ' '
+                                                        'normalized' => 
'numbered'
                                                       },
                                                       'structure' => {
                                                         'associated_unit' => 
{},
@@ -4518,9 +4457,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                           'extra' => {
                                                             
'associated_section' => {
                                                               'cmdname' => 
'unnumberedsec',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {
                                                                   'extra' => {
@@ -4537,16 +4474,13 @@ $result_nodes{'complex_split_at_node'} = {
                                                                             
'extra' => {
                                                                               
'associated_section' => {
                                                                                
 'cmdname' => 'subsection',
-                                                                               
 'extra' => {
-                                                                               
   'spaces_before_argument' => ' '
-                                                                               
 },
+                                                                               
 'extra' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
                                                                                
   'level' => 3
                                                                                
 }
                                                                               
},
-                                                                              
'normalized' => 'numbered-sub2',
-                                                                              
'spaces_before_argument' => ' '
+                                                                              
'normalized' => 'numbered-sub2'
                                                                             },
                                                                             
'structure' => {
                                                                               
'associated_unit' => {},
@@ -4555,9 +4489,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
 'extra' => {
                                                                                
   'associated_section' => {
                                                                                
     'cmdname' => 'unnumberedsubsec',
-                                                                               
     'extra' => {
-                                                                               
       'spaces_before_argument' => ' '
-                                                                               
     },
+                                                                               
     'extra' => {},
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {
                                                                                
         'extra' => {
@@ -4574,16 +4506,13 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                   'extra' => {
                                                                                
                     'associated_section' => {
                                                                                
                       'cmdname' => 'subsection',
-                                                                               
                       'extra' => {
-                                                                               
                         'spaces_before_argument' => ' '
-                                                                               
                       },
+                                                                               
                       'extra' => {},
                                                                                
                       'structure' => {
                                                                                
                         'associated_unit' => {},
                                                                                
                         'level' => 3
                                                                                
                       }
                                                                                
                     },
-                                                                               
                     'normalized' => 'numbered-sub',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'numbered-sub'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'associated_unit' => {},
@@ -4593,9 +4522,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                       'extra' => {
                                                                                
                         'associated_section' => {
                                                                                
                           'cmdname' => 'unnumberedsubsec',
-                                                                               
                           'extra' => {
-                                                                               
                             'spaces_before_argument' => ' '
-                                                                               
                           },
+                                                                               
                           'extra' => {},
                                                                                
                           'structure' => {
                                                                                
                             'associated_unit' => {
                                                                                
                               'extra' => {
@@ -4625,8 +4552,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                             'level' => 3
                                                                                
                           }
                                                                                
                         },
-                                                                               
                         'normalized' => 'unnumbered-sub',
-                                                                               
                         'spaces_before_argument' => ' '
+                                                                               
                         'normalized' => 'unnumbered-sub'
                                                                                
                       },
                                                                                
                       'structure' => {
                                                                                
                         'associated_unit' => {},
@@ -4682,8 +4608,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
       'level' => 3
                                                                                
     }
                                                                                
   },
-                                                                               
   'normalized' => 'unnumbered-sub2',
-                                                                               
   'spaces_before_argument' => ' '
+                                                                               
   'normalized' => 'unnumbered-sub2'
                                                                                
 },
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
@@ -4726,16 +4651,13 @@ $result_nodes{'complex_split_at_node'} = {
                                                                             
'extra' => {
                                                                               
'associated_section' => {
                                                                                
 'cmdname' => 'subsection',
-                                                                               
 'extra' => {
-                                                                               
   'spaces_before_argument' => ' '
-                                                                               
 },
+                                                                               
 'extra' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
                                                                                
   'level' => 3
                                                                                
 }
                                                                               
},
-                                                                              
'normalized' => 'numbered-sub3',
-                                                                              
'spaces_before_argument' => ' '
+                                                                              
'normalized' => 'numbered-sub3'
                                                                             },
                                                                             
'structure' => {
                                                                               
'associated_unit' => {},
@@ -4783,20 +4705,10 @@ $result_nodes{'complex_split_at_node'} = {
                                                             'menus' => [
                                                               {
                                                                 'cmdname' => 
'menu',
-                                                                'extra' => {
-                                                                  
'end_command' => {
-                                                                    'cmdname' 
=> 'end',
-                                                                    'extra' => 
{
-                                                                      
'command_argument' => 'menu',
-                                                                      
'spaces_before_argument' => ' ',
-                                                                      
'text_arg' => 'menu'
-                                                                    }
-                                                                  }
-                                                                }
+                                                                'extra' => {}
                                                               }
                                                             ],
-                                                            'normalized' => 
'unnumbered2',
-                                                            
'spaces_before_argument' => ' '
+                                                            'normalized' => 
'unnumbered2'
                                                           },
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
@@ -4876,20 +4788,10 @@ $result_nodes{'complex_split_at_node'} = {
                           'menus' => [
                             {
                               'cmdname' => 'menu',
-                              'extra' => {
-                                'end_command' => {
-                                  'cmdname' => 'end',
-                                  'extra' => {
-                                    'command_argument' => 'menu',
-                                    'spaces_before_argument' => ' ',
-                                    'text_arg' => 'menu'
-                                  }
-                                }
-                              }
+                              'extra' => {}
                             }
                           ],
-                          'normalized' => 'unnumbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumbered'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -4949,20 +4851,10 @@ $result_nodes{'complex_split_at_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -5238,8 +5130,7 @@ 
$result_nodes{'complex_split_at_node'}{'structure'}{'node_prev'}{'extra'}{'manua
 $result_menus{'complex_split_at_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -5262,16 +5153,14 @@ $result_menus{'complex_split_at_node'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'First-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'First-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_child' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'unnumbered',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'unnumbered'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -5279,9 +5168,7 @@ $result_menus{'complex_split_at_node'} = {
                           'node' => {},
                           'section' => {
                             'cmdname' => 'unnumberedsec',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 2
@@ -5298,16 +5185,14 @@ $result_menus{'complex_split_at_node'} = {
                                 'node' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'Second-node',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'Second-node'
                                   },
                                   'structure' => {
                                     'associated_unit' => {},
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'Third-node-unnumbered',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'Third-node-unnumbered'
                                       },
                                       'structure' => {
                                         'associated_unit' => {
@@ -5315,9 +5200,7 @@ $result_menus{'complex_split_at_node'} = {
                                             'node' => {},
                                             'section' => {
                                               'cmdname' => 'unnumbered',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 1
@@ -5334,16 +5217,14 @@ $result_menus{'complex_split_at_node'} = {
                                                   'node' => {
                                                     'cmdname' => 'node',
                                                     'extra' => {
-                                                      'normalized' => 
'continuity',
-                                                      'spaces_before_argument' 
=> ' '
+                                                      'normalized' => 
'continuity'
                                                     },
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'menu_next' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'Last-node-no-description',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'Last-node-no-description'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{
@@ -5379,9 +5260,7 @@ $result_menus{'complex_split_at_node'} = {
                                                   },
                                                   'section' => {
                                                     'cmdname' => 'unnumbered',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'level' => 1
@@ -5435,8 +5314,7 @@ $result_menus{'complex_split_at_node'} = {
                                     'menu_prev' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'between-node',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'between-node'
                                       },
                                       'structure' => {
                                         'associated_unit' => {
@@ -5451,16 +5329,14 @@ $result_menus{'complex_split_at_node'} = {
                                                   'node' => {
                                                     'cmdname' => 'node',
                                                     'extra' => {
-                                                      'normalized' => 
'numbered',
-                                                      'spaces_before_argument' 
=> ' '
+                                                      'normalized' => 
'numbered'
                                                     },
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'menu_prev' => {
                                                         'cmdname' => 'node',
                                                         'extra' => {
-                                                          'normalized' => 
'unnumbered2',
-                                                          
'spaces_before_argument' => ' '
+                                                          'normalized' => 
'unnumbered2'
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{
@@ -5468,9 +5344,7 @@ $result_menus{'complex_split_at_node'} = {
                                                               'node' => {},
                                                               'section' => {
                                                                 'cmdname' => 
'unnumberedsec',
-                                                                'extra' => {
-                                                                  
'spaces_before_argument' => ' '
-                                                                },
+                                                                'extra' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
                                                                   'level' => 2
@@ -5485,16 +5359,14 @@ $result_menus{'complex_split_at_node'} = {
                                                                     'node' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
-                                                                        
'normalized' => 'numbered-sub2',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'numbered-sub2'
                                                                       },
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
                                                                         
'menu_prev' => {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
-                                                                            
'normalized' => 'unnumbered-sub2',
-                                                                            
'spaces_before_argument' => ' '
+                                                                            
'normalized' => 'unnumbered-sub2'
                                                                           },
                                                                           
'structure' => {
                                                                             
'associated_unit' => {
@@ -5502,9 +5374,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
 'node' => {},
                                                                                
 'section' => {
                                                                                
   'cmdname' => 'unnumberedsubsec',
-                                                                               
   'extra' => {
-                                                                               
     'spaces_before_argument' => ' '
-                                                                               
   },
+                                                                               
   'extra' => {},
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {},
                                                                                
     'level' => 3
@@ -5519,8 +5389,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
       'node' => {
                                                                                
         'cmdname' => 'node',
                                                                                
         'extra' => {
-                                                                               
           'normalized' => 'numbered-sub',
-                                                                               
           'spaces_before_argument' => ' '
+                                                                               
           'normalized' => 'numbered-sub'
                                                                                
         },
                                                                                
         'structure' => {
                                                                                
           'associated_unit' => {},
@@ -5528,8 +5397,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
           'menu_prev' => {
                                                                                
             'cmdname' => 'node',
                                                                                
             'extra' => {
-                                                                               
               'normalized' => 'unnumbered-sub',
-                                                                               
               'spaces_before_argument' => ' '
+                                                                               
               'normalized' => 'unnumbered-sub'
                                                                                
             },
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {
@@ -5537,9 +5405,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
                   'node' => {},
                                                                                
                   'section' => {
                                                                                
                     'cmdname' => 'unnumberedsubsec',
-                                                                               
                     'extra' => {
-                                                                               
                       'spaces_before_argument' => ' '
-                                                                               
                     },
+                                                                               
                     'extra' => {},
                                                                                
                     'structure' => {
                                                                                
                       'associated_unit' => {},
                                                                                
                       'level' => 3
@@ -5581,9 +5447,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                                
       },
                                                                                
       'section' => {
                                                                                
         'cmdname' => 'subsection',
-                                                                               
         'extra' => {
-                                                                               
           'spaces_before_argument' => ' '
-                                                                               
         },
+                                                                               
         'extra' => {},
                                                                                
         'structure' => {
                                                                                
           'associated_unit' => {},
                                                                                
           'level' => 3
@@ -5646,9 +5510,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                     },
                                                                     'section' 
=> {
                                                                       
'cmdname' => 'subsection',
-                                                                      'extra' 
=> {
-                                                                        
'spaces_before_argument' => ' '
-                                                                      },
+                                                                      'extra' 
=> {},
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
                                                                         
'level' => 3
@@ -5682,8 +5544,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                     'node' => {
                                                                       
'cmdname' => 'node',
                                                                       'extra' 
=> {
-                                                                        
'normalized' => 'numbered-sub3',
-                                                                        
'spaces_before_argument' => ' '
+                                                                        
'normalized' => 'numbered-sub3'
                                                                       },
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
@@ -5695,9 +5556,7 @@ $result_menus{'complex_split_at_node'} = {
                                                                     },
                                                                     'section' 
=> {
                                                                       
'cmdname' => 'subsection',
-                                                                      'extra' 
=> {
-                                                                        
'spaces_before_argument' => ' '
-                                                                      },
+                                                                      'extra' 
=> {},
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
                                                                         
'level' => 3
@@ -5754,9 +5613,7 @@ $result_menus{'complex_split_at_node'} = {
                                                   },
                                                   'section' => {
                                                     'cmdname' => 'section',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> '  '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'level' => 2,
@@ -5809,9 +5666,7 @@ $result_menus{'complex_split_at_node'} = {
                                 },
                                 'section' => {
                                   'cmdname' => 'chapter',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'associated_unit' => {},
                                     'level' => 1,
@@ -5870,9 +5725,7 @@ $result_menus{'complex_split_at_node'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -6182,16 +6035,14 @@ $result_elements{'complex_split_at_node'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'First-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'First-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -6199,9 +6050,7 @@ $result_elements{'complex_split_at_node'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -6219,16 +6068,14 @@ $result_elements{'complex_split_at_node'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'Second-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'Second-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'Third-node-unnumbered',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'Third-node-unnumbered'
                               },
                               'structure' => {
                                 'associated_unit' => {
@@ -6236,9 +6083,7 @@ $result_elements{'complex_split_at_node'} = [
                                     'node' => {},
                                     'section' => {
                                       'cmdname' => 'unnumbered',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 1
@@ -6255,16 +6100,14 @@ $result_elements{'complex_split_at_node'} = [
                                           'node' => {
                                             'cmdname' => 'node',
                                             'extra' => {
-                                              'normalized' => 'continuity',
-                                              'spaces_before_argument' => ' '
+                                              'normalized' => 'continuity'
                                             },
                                             'structure' => {
                                               'associated_unit' => {},
                                               'menu_next' => {
                                                 'cmdname' => 'node',
                                                 'extra' => {
-                                                  'normalized' => 
'Last-node-no-description',
-                                                  'spaces_before_argument' => 
' '
+                                                  'normalized' => 
'Last-node-no-description'
                                                 },
                                                 'structure' => {
                                                   'associated_unit' => {
@@ -6299,9 +6142,7 @@ $result_elements{'complex_split_at_node'} = [
                                           },
                                           'section' => {
                                             'cmdname' => 'unnumbered',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
+                                            'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'level' => 1
@@ -6351,8 +6192,7 @@ $result_elements{'complex_split_at_node'} = [
                             'menu_prev' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'between-node',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'between-node'
                               },
                               'structure' => {
                                 'associated_unit' => {
@@ -6367,16 +6207,14 @@ $result_elements{'complex_split_at_node'} = [
                                           'node' => {
                                             'cmdname' => 'node',
                                             'extra' => {
-                                              'normalized' => 'numbered',
-                                              'spaces_before_argument' => ' '
+                                              'normalized' => 'numbered'
                                             },
                                             'structure' => {
                                               'associated_unit' => {},
                                               'menu_prev' => {
                                                 'cmdname' => 'node',
                                                 'extra' => {
-                                                  'normalized' => 
'unnumbered2',
-                                                  'spaces_before_argument' => 
' '
+                                                  'normalized' => 'unnumbered2'
                                                 },
                                                 'structure' => {
                                                   'associated_unit' => {
@@ -6384,9 +6222,7 @@ $result_elements{'complex_split_at_node'} = [
                                                       'node' => {},
                                                       'section' => {
                                                         'cmdname' => 
'unnumberedsec',
-                                                        'extra' => {
-                                                          
'spaces_before_argument' => ' '
-                                                        },
+                                                        'extra' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
                                                           'level' => 2
@@ -6401,16 +6237,14 @@ $result_elements{'complex_split_at_node'} = [
                                                             'node' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> 'numbered-sub2',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> 'numbered-sub2'
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 'menu_prev' => 
{
                                                                   'cmdname' => 
'node',
                                                                   'extra' => {
-                                                                    
'normalized' => 'unnumbered-sub2',
-                                                                    
'spaces_before_argument' => ' '
+                                                                    
'normalized' => 'unnumbered-sub2'
                                                                   },
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {
@@ -6418,9 +6252,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                         'node' 
=> {},
                                                                         
'section' => {
                                                                           
'cmdname' => 'unnumberedsubsec',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
                                                                             
'level' => 3
@@ -6435,8 +6267,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                               
'node' => {
                                                                                
 'cmdname' => 'node',
                                                                                
 'extra' => {
-                                                                               
   'normalized' => 'numbered-sub',
-                                                                               
   'spaces_before_argument' => ' '
+                                                                               
   'normalized' => 'numbered-sub'
                                                                                
 },
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
@@ -6444,8 +6275,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
   'menu_prev' => {
                                                                                
     'cmdname' => 'node',
                                                                                
     'extra' => {
-                                                                               
       'normalized' => 'unnumbered-sub',
-                                                                               
       'spaces_before_argument' => ' '
+                                                                               
       'normalized' => 'unnumbered-sub'
                                                                                
     },
                                                                                
     'structure' => {
                                                                                
       'associated_unit' => {
@@ -6453,9 +6283,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
           'node' => {},
                                                                                
           'section' => {
                                                                                
             'cmdname' => 'unnumberedsubsec',
-                                                                               
             'extra' => {
-                                                                               
               'spaces_before_argument' => ' '
-                                                                               
             },
+                                                                               
             'extra' => {},
                                                                                
             'structure' => {
                                                                                
               'associated_unit' => {},
                                                                                
               'level' => 3
@@ -6470,8 +6298,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
                 'node' => {
                                                                                
                   'cmdname' => 'node',
                                                                                
                   'extra' => {
-                                                                               
                     'normalized' => 'unnumbered',
-                                                                               
                     'spaces_before_argument' => ' '
+                                                                               
                     'normalized' => 'unnumbered'
                                                                                
                   },
                                                                                
                   'structure' => {
                                                                                
                     'associated_unit' => {},
@@ -6485,9 +6312,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                                
                 },
                                                                                
                 'section' => {
                                                                                
                   'cmdname' => 'unnumberedsec',
-                                                                               
                   'extra' => {
-                                                                               
                     'spaces_before_argument' => ' '
-                                                                               
                   },
+                                                                               
                   'extra' => {},
                                                                                
                   'structure' => {
                                                                                
                     'associated_unit' => {},
                                                                                
                     'level' => 2
@@ -6541,9 +6366,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                               
},
                                                                               
'section' => {
                                                                                
 'cmdname' => 'subsection',
-                                                                               
 'extra' => {
-                                                                               
   'spaces_before_argument' => ' '
-                                                                               
 },
+                                                                               
 'extra' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
                                                                                
   'level' => 3
@@ -6602,9 +6425,7 @@ $result_elements{'complex_split_at_node'} = [
                                                             },
                                                             'section' => {
                                                               'cmdname' => 
'subsection',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 'level' => 3
@@ -6636,8 +6457,7 @@ $result_elements{'complex_split_at_node'} = [
                                                             'node' => {
                                                               'cmdname' => 
'node',
                                                               'extra' => {
-                                                                'normalized' 
=> 'numbered-sub3',
-                                                                
'spaces_before_argument' => ' '
+                                                                'normalized' 
=> 'numbered-sub3'
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {},
@@ -6649,9 +6469,7 @@ $result_elements{'complex_split_at_node'} = [
                                                             },
                                                             'section' => {
                                                               'cmdname' => 
'subsection',
-                                                              'extra' => {
-                                                                
'spaces_before_argument' => ' '
-                                                              },
+                                                              'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
                                                                 'level' => 3
@@ -6704,9 +6522,7 @@ $result_elements{'complex_split_at_node'} = [
                                           },
                                           'section' => {
                                             'cmdname' => 'section',
-                                            'extra' => {
-                                              'spaces_before_argument' => '  '
-                                            },
+                                            'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'level' => 2,
@@ -6755,9 +6571,7 @@ $result_elements{'complex_split_at_node'} = [
                         },
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index 6b0b0125ae..4f668c0a1e 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -545,44 +545,34 @@ $result_sectioning{'contents'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => '1.1.1.1',
@@ -613,8 +603,7 @@ $result_sectioning{'contents'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -623,8 +612,7 @@ $result_sectioning{'contents'} = {
               'toplevel_prev' => {},
               'toplevel_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -632,9 +620,7 @@ $result_sectioning{'contents'} = {
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -646,9 +632,7 @@ $result_sectioning{'contents'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -664,18 +648,14 @@ $result_sectioning{'contents'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 'A.1',
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index d5c8131407..edf30be219 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -574,44 +574,34 @@ $result_sectioning{'contents_and_shortcontents'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => '1.1.1.1',
@@ -642,8 +632,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -652,8 +641,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
               'toplevel_prev' => {},
               'toplevel_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -661,9 +649,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -675,9 +661,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -693,18 +677,14 @@ $result_sectioning{'contents_and_shortcontents'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 'A.1',
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl 
b/tp/t/results/sectioning/contents_at_document_begin.pl
index e1faf36ebe..7e9effeaf4 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -286,21 +286,17 @@ $result_sectioning{'contents_at_document_begin'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -326,15 +322,12 @@ $result_nodes{'contents_at_document_begin'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -342,8 +335,7 @@ $result_nodes{'contents_at_document_begin'} = {
 $result_menus{'contents_at_document_begin'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl 
b/tp/t/results/sectioning/contents_at_end_document.pl
index 0f526e5080..b4caf52c06 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -286,21 +286,17 @@ $result_sectioning{'contents_at_end_document'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -326,15 +322,12 @@ $result_nodes{'contents_at_end_document'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -342,8 +335,7 @@ $result_nodes{'contents_at_end_document'} = {
 $result_menus{'contents_at_end_document'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
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 0711b0a5dd..53328d2233 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
@@ -516,21 +516,17 @@ $result_sectioning{'contents_at_end_document_after_node'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -556,9 +552,7 @@ $result_nodes{'contents_at_end_document_after_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -566,27 +560,16 @@ $result_nodes{'contents_at_end_document_after_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'a-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'a-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -603,15 +586,13 @@ 
$result_nodes{'contents_at_end_document_after_node'}{'structure'}{'node_next'} =
 $result_menus{'contents_at_end_document_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'a-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'a-node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/contents_in_document.pl 
b/tp/t/results/sectioning/contents_in_document.pl
index 9696d4833e..ba6410112c 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -286,21 +286,17 @@ $result_sectioning{'contents_in_document'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -326,15 +322,12 @@ $result_nodes{'contents_in_document'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -342,8 +335,7 @@ $result_nodes{'contents_in_document'} = {
 $result_menus{'contents_in_document'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 5311c61f15..1cb894c3b6 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -248,26 +248,20 @@ $result_sectioning{'contents_in_html_text'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
@@ -282,9 +276,7 @@ $result_sectioning{'contents_in_html_text'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2,
diff --git a/tp/t/results/sectioning/contents_no_section.pl 
b/tp/t/results/sectioning/contents_no_section.pl
index fb64316ad8..ea5a665cec 100644
--- a/tp/t/results/sectioning/contents_no_section.pl
+++ b/tp/t/results/sectioning/contents_no_section.pl
@@ -199,8 +199,7 @@ $result_texts{'contents_no_section'} = '
 $result_nodes{'contents_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -208,8 +207,7 @@ $result_nodes{'contents_no_section'} = {
 $result_menus{'contents_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 9658019e30..7e279fd9ed 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -112,16 +112,14 @@ $result_texts{'contents_with_only_top_node'} = '
 $result_nodes{'contents_with_only_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'contents_with_only_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index da58b22915..4fe09dff43 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -625,16 +625,14 @@ Text, float1
 $result_nodes{'double_node_anchor_float'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'node1',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node1'
   }
 };
 
 $result_menus{'double_node_anchor_float'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'node1',
-    'spaces_before_argument' => ' '
+    'normalized' => 'node1'
   }
 };
 
@@ -755,15 +753,6 @@ $result_floats{'double_node_anchor_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -778,15 +767,6 @@ $result_floats{'double_node_anchor_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
@@ -801,16 +781,7 @@ $result_floats{'double_node_anchor_float'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float1',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 67cf365331..83d5fe75f6 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -535,8 +535,7 @@ $result_sectioning{'double_part'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -554,8 +553,7 @@ $result_sectioning{'double_part'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'node-chapter',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'node-chapter'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -568,8 +566,7 @@ $result_sectioning{'double_part'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -579,9 +576,7 @@ $result_sectioning{'double_part'} = {
                                 ],
                                 'section_prev' => {
                                   'cmdname' => 'part',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'associated_unit' => {
                                       'extra' => {
@@ -610,8 +605,7 @@ $result_sectioning{'double_part'} = {
                                 },
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -648,8 +642,7 @@ $result_sectioning{'double_part'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -714,9 +707,7 @@ $result_nodes{'double_part'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -738,15 +729,12 @@ $result_nodes{'double_part'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -754,8 +742,7 @@ $result_nodes{'double_part'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'node-chapter',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'node-chapter'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -773,9 +760,7 @@ $result_nodes{'double_part'} = {
                         'first_in_page' => {},
                         'section' => {
                           'cmdname' => 'part',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 0
@@ -823,20 +808,10 @@ $result_nodes{'double_part'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -886,8 +861,7 @@ $result_nodes{'double_part'}{'structure'}{'node_next'} = 
$result_nodes{'double_p
 $result_menus{'double_part'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -896,9 +870,7 @@ $result_menus{'double_part'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -914,8 +886,7 @@ $result_menus{'double_part'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'node-chapter',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'node-chapter'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -930,15 +901,12 @@ $result_menus{'double_part'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -955,9 +923,7 @@ $result_menus{'double_part'} = {
                     'first_in_page' => {},
                     'section' => {
                       'cmdname' => 'part',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 0
@@ -1078,16 +1044,14 @@ $result_elements{'double_part'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'node-chapter',
-              'spaces_before_argument' => ' '
+              'normalized' => 'node-chapter'
             },
             'structure' => {
               'associated_unit' => {
@@ -1099,15 +1063,12 @@ $result_elements{'double_part'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1124,9 +1085,7 @@ $result_elements{'double_part'} = [
                         'first_in_page' => {},
                         'section' => {
                           'cmdname' => 'part',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 0
@@ -1165,9 +1124,7 @@ $result_elements{'double_part'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index 1bc7bf7b02..48d1184d24 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -240,8 +240,7 @@ $result_texts{'double_top'} = '
 $result_nodes{'double_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {}
@@ -252,8 +251,7 @@ $result_nodes{'double_top'}{'structure'}{'node_next'} = 
$result_nodes{'double_to
 $result_menus{'double_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 231588150f..f0a1005621 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -432,20 +432,10 @@ $result_nodes{'double_top_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
@@ -458,8 +448,7 @@ 
$result_nodes{'double_top_in_menu'}{'structure'}{'node_next'} = $result_nodes{'d
 $result_menus{'double_top_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {},
diff --git a/tp/t/results/sectioning/double_top_section.pl 
b/tp/t/results/sectioning/double_top_section.pl
index 742dcf96fc..121e47c038 100644
--- a/tp/t/results/sectioning/double_top_section.pl
+++ b/tp/t/results/sectioning/double_top_section.pl
@@ -157,9 +157,7 @@ $result_sectioning{'double_top_section'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
@@ -167,9 +165,7 @@ $result_sectioning{'double_top_section'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index f64c433119..7bf31a501e 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -202,8 +202,7 @@ $result_texts{'email_in_node'} = '';
 $result_nodes{'email_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a-c-',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a-c-'
   },
   'structure' => {}
 };
@@ -211,8 +210,7 @@ $result_nodes{'email_in_node'} = {
 $result_menus{'email_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a-c-',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a-c-'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index b25a997b78..19cd3eb673 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -451,8 +451,7 @@ Top
 $result_nodes{'empty_ref_arg'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -460,8 +459,7 @@ $result_nodes{'empty_ref_arg'} = {
 $result_menus{'empty_ref_arg'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index 23e61c3a9f..ea84c587da 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -311,12 +311,10 @@ $result_sectioning{'empty_top_node_up'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -333,9 +331,7 @@ $result_nodes{'empty_top_node_up'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -343,27 +339,16 @@ $result_nodes{'empty_top_node_up'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'node_prev' => {},
@@ -380,15 +365,13 @@ 
$result_nodes{'empty_top_node_up'}{'structure'}{'node_next'} = $result_nodes{'em
 $result_menus{'empty_top_node_up'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index ac6c4f7487..9c3953ac4b 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -501,20 +501,10 @@ $result_nodes{'equivalent_labels'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -535,8 +525,7 @@ 
$result_nodes{'equivalent_labels'}{'structure'}{'node_next'} = $result_nodes{'eq
 $result_menus{'equivalent_labels'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -548,16 +537,7 @@ $result_menus{'equivalent_labels'} = {
         'menu_next' => {
           'cmdname' => 'float',
           'extra' => {
-            'end_command' => {
-              'cmdname' => 'end',
-              'extra' => {
-                'command_argument' => 'float',
-                'spaces_before_argument' => ' ',
-                'text_arg' => 'float'
-              }
-            },
             'normalized' => 'floa',
-            'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
                 {
@@ -615,16 +595,7 @@ $result_floats{'equivalent_labels'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'floa',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index 8b619f3da0..6c70aa66a6 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -413,27 +413,16 @@ $result_nodes{'equivalent_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'node_up' => {}
@@ -448,15 +437,13 @@ 
$result_nodes{'equivalent_nodes'}{'structure'}{'node_next'} = $result_nodes{'equ
 $result_menus{'equivalent_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 52dd5b4d19..65c907446d 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -574,20 +574,10 @@ $result_nodes{'explicit_node_directions'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -602,16 +592,14 @@ $result_nodes{'explicit_node_directions'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'third-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'third-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -705,8 +693,7 @@ 
$result_nodes{'explicit_node_directions'}{'structure'}{'node_next'} = $result_no
 $result_menus{'explicit_node_directions'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -721,16 +708,14 @@ $result_menus{'explicit_node_directions'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'third-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'third-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -835,16 +820,14 @@ $result_elements{'explicit_node_directions'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'second-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'second-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -860,8 +843,7 @@ $result_elements{'explicit_node_directions'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'third-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'third-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index bcb4552c34..ff084d6cc2 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -595,12 +595,10 @@ $result_sectioning{'external_node_in_menu'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -611,12 +609,10 @@ $result_sectioning{'external_node_in_menu'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'nchapter1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'nchapter1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -632,12 +628,10 @@ $result_sectioning{'external_node_in_menu'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'nchapter2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'nchapter2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -669,9 +663,7 @@ $result_nodes{'external_node_in_menu'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -679,20 +671,10 @@ $result_nodes{'external_node_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -700,16 +682,13 @@ $result_nodes{'external_node_in_menu'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'nchapter1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nchapter1'
       },
       'structure' => {
         'node_next' => {
@@ -717,16 +696,13 @@ $result_nodes{'external_node_in_menu'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'nchapter2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'nchapter2'
           },
           'structure' => {
             'node_prev' => {},
@@ -749,15 +725,13 @@ 
$result_nodes{'external_node_in_menu'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'external_node_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'nchapter1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'nchapter1'
       },
       'structure' => {
         'menu_next' => {
diff --git a/tp/t/results/sectioning/hole_in_sectioning.pl 
b/tp/t/results/sectioning/hole_in_sectioning.pl
index 8add24e585..03e03dbb91 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -243,35 +243,27 @@ $result_sectioning{'hole_in_sectioning'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsubsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
@@ -280,9 +272,7 @@ $result_sectioning{'hole_in_sectioning'} = {
                         },
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.2',
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index 5b50cb62ac..76cd29b7d6 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -343,8 +343,7 @@ $result_sectioning{'internal_top_node_up'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -360,8 +359,7 @@ $result_sectioning{'internal_top_node_up'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'first',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'first'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -391,8 +389,7 @@ $result_sectioning{'internal_top_node_up'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -427,9 +424,7 @@ $result_nodes{'internal_top_node_up'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -444,8 +439,7 @@ $result_nodes{'internal_top_node_up'} = {
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'first',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'first'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -482,20 +476,10 @@ $result_nodes{'internal_top_node_up'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -528,8 +512,7 @@ 
$result_nodes{'internal_top_node_up'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'internal_top_node_up'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -537,9 +520,7 @@ $result_menus{'internal_top_node_up'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -554,8 +535,7 @@ $result_menus{'internal_top_node_up'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -622,16 +602,14 @@ $result_elements{'internal_top_node_up'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'first',
-              'spaces_before_argument' => ' '
+              'normalized' => 'first'
             },
             'structure' => {
               'associated_unit' => {
@@ -661,9 +639,7 @@ $result_elements{'internal_top_node_up'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 7c0666563e..e8f03822d4 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -375,8 +375,7 @@ $result_sectioning{'lone_Top_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'First',
-              'spaces_before_argument' => ' '
+              'normalized' => 'First'
             },
             'structure' => {
               'associated_unit' => {
@@ -395,8 +394,7 @@ $result_sectioning{'lone_Top_node'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -423,20 +421,10 @@ $result_nodes{'lone_Top_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -446,17 +434,14 @@ $result_nodes{'lone_Top_node'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'First',
-            'spaces_before_argument' => ' '
+            'normalized' => 'First'
           },
           'structure' => {
             'associated_unit' => {},
@@ -495,8 +480,7 @@ $result_nodes{'lone_Top_node'}{'structure'}{'node_next'} = 
$result_nodes{'lone_T
 $result_menus{'lone_Top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -504,8 +488,7 @@ $result_menus{'lone_Top_node'} = {
         'node' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'First',
-            'spaces_before_argument' => ' '
+            'normalized' => 'First'
           },
           'structure' => {
             'associated_unit' => {},
@@ -517,9 +500,7 @@ $result_menus{'lone_Top_node'} = {
         },
         'section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1,
@@ -571,16 +552,14 @@ $result_elements{'lone_Top_node'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'First',
-          'spaces_before_argument' => ' '
+          'normalized' => 'First'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_up' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {},
@@ -594,9 +573,7 @@ $result_elements{'lone_Top_node'} = [
       },
       'section' => {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1,
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 073b22b1f4..b2018ea7fd 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -814,12 +814,10 @@ $result_sectioning{'loop_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -836,9 +834,7 @@ $result_nodes{'loop_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -846,20 +842,10 @@ $result_nodes{'loop_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -868,20 +854,10 @@ $result_nodes{'loop_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'node-up',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-up'
       },
       'structure' => {
         'menu_child' => {
@@ -890,27 +866,16 @@ $result_nodes{'loop_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'node-middle',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-middle'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'node-down',
-                'spaces_before_argument' => ' '
+                'normalized' => 'node-down'
               },
               'structure' => {
                 'node_up' => {}
@@ -935,29 +900,25 @@ $result_nodes{'loop_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'loop_node
 $result_menus{'loop_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-up',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-up'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node-middle',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-middle'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'node-down',
-                'spaces_before_argument' => ' '
+                'normalized' => 'node-down'
               },
               'structure' => {
                 'menu_up' => {},
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 0929007212..4d178d7cf3 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -1502,8 +1502,7 @@ $result_sectioning{'lowered_subsubsection'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -1517,12 +1516,10 @@ $result_sectioning{'lowered_subsubsection'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1534,12 +1531,10 @@ $result_sectioning{'lowered_subsubsection'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'Section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'Section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1551,12 +1546,10 @@ $result_sectioning{'lowered_subsubsection'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'Subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'Subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1568,12 +1561,10 @@ $result_sectioning{'lowered_subsubsection'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 'Subsubsection',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 'Subsubsection'
                                     },
                                     'structure' => {}
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -1587,13 +1578,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 'Lowered-subsec',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 'Lowered-subsec'
                                     },
                                     'structure' => {}
                                   },
-                                  'sections_level' => -1,
-                                  'spaces_before_argument' => ' '
+                                  'sections_level' => -1
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -1608,13 +1597,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 'Lowered-subsubsection',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 'Lowered-subsubsection'
                                     },
                                     'structure' => {}
                                   },
-                                  'sections_level' => -1,
-                                  'spaces_before_argument' => ' '
+                                  'sections_level' => -1
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -1669,20 +1656,10 @@ $result_nodes{'lowered_subsubsection'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1690,9 +1667,7 @@ $result_nodes{'lowered_subsubsection'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1701,20 +1676,10 @@ $result_nodes{'lowered_subsubsection'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'Chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1722,9 +1687,7 @@ $result_nodes{'lowered_subsubsection'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1733,20 +1696,10 @@ $result_nodes{'lowered_subsubsection'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'Section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Section'
           },
           'structure' => {
             'menu_child' => {
@@ -1754,9 +1707,7 @@ $result_nodes{'lowered_subsubsection'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
@@ -1765,20 +1716,10 @@ $result_nodes{'lowered_subsubsection'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'Subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Subsection'
               },
               'structure' => {
                 'menu_child' => {
@@ -1786,16 +1727,13 @@ $result_nodes{'lowered_subsubsection'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'subsubsection',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 4,
                         'number' => '1.1.1.1'
                       }
                     },
-                    'normalized' => 'Subsubsection',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Subsubsection'
                   },
                   'structure' => {
                     'node_next' => {
@@ -1804,8 +1742,7 @@ $result_nodes{'lowered_subsubsection'} = {
                         'associated_section' => {
                           'cmdname' => 'subsection',
                           'extra' => {
-                            'sections_level' => -1,
-                            'spaces_before_argument' => ' '
+                            'sections_level' => -1
                           },
                           'structure' => {
                             'level' => 4,
@@ -1815,20 +1752,10 @@ $result_nodes{'lowered_subsubsection'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'Lowered-subsec',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'Lowered-subsec'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -1837,16 +1764,14 @@ $result_nodes{'lowered_subsubsection'} = {
                             'associated_section' => {
                               'cmdname' => 'subsubsection',
                               'extra' => {
-                                'sections_level' => -1,
-                                'spaces_before_argument' => ' '
+                                'sections_level' => -1
                               },
                               'structure' => {
                                 'level' => 4,
                                 'number' => '1.1.1.3'
                               }
                             },
-                            'normalized' => 'Lowered-subsubsection',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'Lowered-subsubsection'
                           },
                           'structure' => {
                             'node_prev' => {},
@@ -1889,50 +1814,43 @@ 
$result_nodes{'lowered_subsubsection'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'lowered_subsubsection'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Subsection'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Subsubsection',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Subsubsection'
                   },
                   'structure' => {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'Lowered-subsec',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'Lowered-subsec'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'Lowered-subsubsection',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'Lowered-subsubsection'
                           },
                           'structure' => {
                             'menu_up' => {},
diff --git a/tp/t/results/sectioning/loweredheading.pl 
b/tp/t/results/sectioning/loweredheading.pl
index 2e398221cc..d564791f5f 100644
--- a/tp/t/results/sectioning/loweredheading.pl
+++ b/tp/t/results/sectioning/loweredheading.pl
@@ -132,8 +132,7 @@ $result_sectioning{'loweredheading'} = {
       {
         'cmdname' => 'section',
         'extra' => {
-          'sections_level' => -1,
-          'spaces_before_argument' => ' '
+          'sections_level' => -1
         },
         'structure' => {
           'level' => 3,
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 04833bfcac..03a5c8dce3 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -1303,12 +1303,10 @@ $result_sectioning{'menutextorder'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'bar',
-              'spaces_before_argument' => ' '
+              'normalized' => 'bar'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -1320,12 +1318,10 @@ $result_sectioning{'menutextorder'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'onesub1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'onesub1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 2,
@@ -1339,12 +1335,10 @@ $result_sectioning{'menutextorder'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'onesub2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'onesub2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 2,
@@ -1363,12 +1357,10 @@ $result_sectioning{'menutextorder'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'foo',
-              'spaces_before_argument' => ' '
+              'normalized' => 'foo'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -1380,12 +1372,10 @@ $result_sectioning{'menutextorder'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'sub1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sub1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 2,
@@ -1399,12 +1389,10 @@ $result_sectioning{'menutextorder'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'sub2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sub2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 2,
@@ -1419,12 +1407,10 @@ $result_sectioning{'menutextorder'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'sub3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sub3'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 2,
@@ -1460,9 +1446,7 @@ $result_nodes{'menutextorder'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1,
         'number' => 1
@@ -1471,20 +1455,10 @@ $result_nodes{'menutextorder'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'bar',
-    'spaces_before_argument' => ' '
+    'normalized' => 'bar'
   },
   'structure' => {
     'menu_child' => {
@@ -1492,16 +1466,13 @@ $result_nodes{'menutextorder'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'section',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2,
             'number' => '1.2'
           }
         },
-        'normalized' => 'onesub2',
-        'spaces_before_argument' => ' '
+        'normalized' => 'onesub2'
       },
       'structure' => {
         'node_prev' => {
@@ -1509,16 +1480,13 @@ $result_nodes{'menutextorder'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
               }
             },
-            'normalized' => 'onesub1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'onesub1'
           },
           'structure' => {
             'node_next' => {},
@@ -1533,9 +1501,7 @@ $result_nodes{'menutextorder'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 2
@@ -1544,20 +1510,10 @@ $result_nodes{'menutextorder'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'foo',
-        'spaces_before_argument' => ' '
+        'normalized' => 'foo'
       },
       'structure' => {
         'menu_child' => {
@@ -1565,16 +1521,13 @@ $result_nodes{'menutextorder'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '2.1'
               }
             },
-            'normalized' => 'sub1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'sub1'
           },
           'structure' => {
             'node_next' => {
@@ -1582,16 +1535,13 @@ $result_nodes{'menutextorder'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '2.2'
                   }
                 },
-                'normalized' => 'sub2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'sub2'
               },
               'structure' => {
                 'node_next' => {
@@ -1599,16 +1549,13 @@ $result_nodes{'menutextorder'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'section',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2,
                         'number' => '2.3'
                       }
                     },
-                    'normalized' => 'sub3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'sub3'
                   },
                   'structure' => {
                     'node_next' => {},
@@ -1642,15 +1589,13 @@ 
$result_nodes{'menutextorder'}{'structure'}{'node_next'}{'structure'}{'node_prev
 $result_menus{'menutextorder'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'bar',
-    'spaces_before_argument' => ' '
+    'normalized' => 'bar'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'onesub2',
-        'spaces_before_argument' => ' '
+        'normalized' => 'onesub2'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl 
b/tp/t/results/sectioning/more_sections_than_nodes.pl
index 972d3f0a36..3042f617ee 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -1369,21 +1369,17 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -1398,12 +1394,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'n-c2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'n-c2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1411,9 +1405,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '2.1',
@@ -1433,12 +1425,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'n-c3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'n-c3'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1446,9 +1436,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '3.1',
@@ -1461,12 +1449,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'n-c3-s-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'n-c3-s-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -1477,9 +1463,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
                   },
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '3.3',
@@ -1496,27 +1480,21 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 4,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '4.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '4.1.1',
@@ -1529,12 +1507,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'n-c3-s1-s2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'n-c3-s1-s2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -1556,9 +1532,7 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             {
               'cmdname' => 'appendix',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 'A',
@@ -1611,9 +1585,7 @@ $result_nodes{'more_sections_than_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1621,20 +1593,10 @@ $result_nodes{'more_sections_than_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1642,16 +1604,13 @@ $result_nodes{'more_sections_than_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 2
           }
         },
-        'normalized' => 'n-c2',
-        'spaces_before_argument' => ' '
+        'normalized' => 'n-c2'
       },
       'structure' => {
         'node_next' => {
@@ -1659,9 +1618,7 @@ $result_nodes{'more_sections_than_nodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3
@@ -1670,20 +1627,10 @@ $result_nodes{'more_sections_than_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'n-c3',
-            'spaces_before_argument' => ' '
+            'normalized' => 'n-c3'
           },
           'structure' => {
             'menu_child' => {
@@ -1691,16 +1638,13 @@ $result_nodes{'more_sections_than_nodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '3.2'
                   }
                 },
-                'normalized' => 'n-c3-s-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s-2'
               },
               'structure' => {
                 'node_up' => {}
@@ -1711,16 +1655,13 @@ $result_nodes{'more_sections_than_nodes'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '4.1.2'
                   }
                 },
-                'normalized' => 'n-c3-s1-s2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s1-s2'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1750,29 +1691,25 @@ 
$result_nodes{'more_sections_than_nodes'}{'structure'}{'node_next'} = $result_no
 $result_menus{'more_sections_than_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'n-c2',
-        'spaces_before_argument' => ' '
+        'normalized' => 'n-c2'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'n-c3',
-            'spaces_before_argument' => ' '
+            'normalized' => 'n-c3'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'n-c3-s-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s-2'
               },
               'structure' => {
                 'menu_up' => {},
@@ -1784,8 +1721,7 @@ $result_menus{'more_sections_than_nodes'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'n-c3-s1-s2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'n-c3-s1-s2'
               },
               'structure' => {
                 'menu_prev' => {},
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 2eda9f7970..5b626787d9 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -879,12 +879,10 @@ $result_sectioning{'next_in_menu_is_below'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -895,12 +893,10 @@ $result_sectioning{'next_in_menu_is_below'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -912,12 +908,10 @@ $result_sectioning{'next_in_menu_is_below'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -929,12 +923,10 @@ $result_sectioning{'next_in_menu_is_below'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -971,9 +963,7 @@ $result_nodes{'next_in_menu_is_below'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -981,20 +971,10 @@ $result_nodes{'next_in_menu_is_below'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1002,9 +982,7 @@ $result_nodes{'next_in_menu_is_below'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1013,20 +991,10 @@ $result_nodes{'next_in_menu_is_below'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1034,9 +1002,7 @@ $result_nodes{'next_in_menu_is_below'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
@@ -1045,20 +1011,10 @@ $result_nodes{'next_in_menu_is_below'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
@@ -1066,16 +1022,13 @@ $result_nodes{'next_in_menu_is_below'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'subsection',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 3,
                     'number' => '1.1.1'
                   }
                 },
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1104,29 +1057,25 @@ 
$result_nodes{'next_in_menu_is_below'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'next_in_menu_is_below'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'subsection',
-                'spaces_before_argument' => ' '
+                'normalized' => 'subsection'
               },
               'structure' => {
                 'menu_prev' => {},
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 3c2a38288a..9db9e7ea77 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -481,34 +481,22 @@ $result_nodes{'next_no_prev_to_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-node'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'no-return',
-            'spaces_before_argument' => ' '
+            'normalized' => 'no-return'
           },
           'structure' => {
             'node_up' => {}
@@ -529,22 +517,19 @@ 
$result_nodes{'next_no_prev_to_node'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'next_no_prev_to_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'no-return',
-            'spaces_before_argument' => ' '
+            'normalized' => 'no-return'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 6ac230f611..90343bc0ca 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -162,17 +162,13 @@ $result_sectioning{'no_argument_and_contents'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index 70c8bfad97..e56c8a91d0 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -847,16 +847,7 @@ $result_floats{'no_element'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float-anchor',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index b0edea39b4..8400f32d7e 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -380,8 +380,7 @@ $result_sectioning{'no_menu'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -395,12 +394,10 @@ $result_sectioning{'no_menu'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'c1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'c1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -416,12 +413,10 @@ $result_sectioning{'no_menu'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'c2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'c2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -438,12 +433,10 @@ $result_sectioning{'no_menu'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'c3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'c3'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -484,8 +477,7 @@ $result_nodes{'no_menu'} = {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -493,16 +485,13 @@ $result_nodes{'no_menu'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'c1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'c1'
       },
       'structure' => {
         'node_next' => {
@@ -510,16 +499,13 @@ $result_nodes{'no_menu'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'c2',
-            'spaces_before_argument' => ' '
+            'normalized' => 'c2'
           },
           'structure' => {
             'node_next' => {
@@ -527,16 +513,13 @@ $result_nodes{'no_menu'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => 'c3',
-                'spaces_before_argument' => ' '
+                'normalized' => 'c3'
               },
               'structure' => {
                 'node_prev' => {},
@@ -563,8 +546,7 @@ 
$result_nodes{'no_menu'}{'structure'}{'node_next'}{'structure'}{'node_up'} = $re
 $result_menus{'no_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index 6b8a378dec..0ab5da148d 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -77,8 +77,7 @@ $result_texts{'node_empty_direction'} = '';
 $result_nodes{'node_empty_direction'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'name',
-    'spaces_before_argument' => ' '
+    'normalized' => 'name'
   },
   'structure' => {}
 };
@@ -86,8 +85,7 @@ $result_nodes{'node_empty_direction'} = {
 $result_menus{'node_empty_direction'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'name',
-    'spaces_before_argument' => ' '
+    'normalized' => 'name'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index 27b5be9e45..85da7bf27c 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -733,8 +733,7 @@ $result_texts{'node_line_arguments'} = '
 $result_nodes{'node_line_arguments'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'one-arg1',
-    'spaces_before_argument' => ' '
+    'normalized' => 'one-arg1'
   },
   'structure' => {}
 };
@@ -742,8 +741,7 @@ $result_nodes{'node_line_arguments'} = {
 $result_menus{'node_line_arguments'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'one-arg1',
-    'spaces_before_argument' => ' '
+    'normalized' => 'one-arg1'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index 1a8696aba7..5cdec41e73 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -529,20 +529,10 @@ $result_nodes{'node_nested_parentheses'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -562,8 +552,7 @@ 
$result_nodes{'node_nested_parentheses'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'node_nested_parentheses'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
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 0747006676..e3fb63bbdb 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -649,8 +649,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -666,8 +665,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -676,8 +674,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -699,8 +696,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'part-chapter-node',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'part-chapter-node'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -713,8 +709,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                   'associated_part' => {
                                     'cmdname' => 'part',
                                     'extra' => {
-                                      'part_associated_section' => {},
-                                      'spaces_before_argument' => ' '
+                                      'part_associated_section' => {}
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
@@ -725,8 +720,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -777,8 +771,7 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -850,9 +843,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -869,17 +860,14 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -891,9 +879,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                             'extra' => {
                               'associated_part' => {
                                 'cmdname' => 'part',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -916,8 +902,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                                   },
                                   'level' => 0
                                 }
-                              },
-                              'spaces_before_argument' => ' '
+                              }
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -925,8 +910,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                               'number' => 2
                             }
                           },
-                          'normalized' => 'part-chapter-node',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'part-chapter-node'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -976,20 +960,10 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -1046,8 +1020,7 @@ 
$result_nodes{'node_part_chapter_after_chapter'}{'structure'}{'node_next'} = $re
 $result_menus{'node_part_chapter_after_chapter'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1055,9 +1028,7 @@ $result_menus{'node_part_chapter_after_chapter'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1072,16 +1043,14 @@ $result_menus{'node_part_chapter_after_chapter'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'part-chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'part-chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -1092,15 +1061,12 @@ $result_menus{'node_part_chapter_after_chapter'} = {
                             'extra' => {
                               'associated_part' => {
                                 'cmdname' => 'part',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 0
                                 }
-                              },
-                              'spaces_before_argument' => ' '
+                              }
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -1138,9 +1104,7 @@ $result_menus{'node_part_chapter_after_chapter'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -1244,16 +1208,14 @@ $result_elements{'node_part_chapter_after_chapter'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1261,9 +1223,7 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -1281,8 +1241,7 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'part-chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'part-chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1298,15 +1257,12 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                           'extra' => {
                             'associated_part' => {
                               'cmdname' => 'part',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 0
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1351,9 +1307,7 @@ $result_elements{'node_part_chapter_after_chapter'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
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 5127d0df98..58674415b0 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -431,8 +431,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -448,8 +447,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -462,8 +460,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -474,8 +471,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -512,8 +508,7 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -562,9 +557,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -584,15 +577,12 @@ $result_nodes{'node_part_chapter_after_top'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -600,8 +590,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -641,20 +630,10 @@ $result_nodes{'node_part_chapter_after_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -692,8 +671,7 @@ 
$result_nodes{'node_part_chapter_after_top'}{'structure'}{'node_next'} = $result
 $result_menus{'node_part_chapter_after_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -701,9 +679,7 @@ $result_menus{'node_part_chapter_after_top'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -718,8 +694,7 @@ $result_menus{'node_part_chapter_after_top'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -734,15 +709,12 @@ $result_menus{'node_part_chapter_after_top'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -823,16 +795,14 @@ $result_elements{'node_part_chapter_after_top'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -843,15 +813,12 @@ $result_elements{'node_part_chapter_after_top'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -883,9 +850,7 @@ $result_elements{'node_part_chapter_after_top'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index c3a7ab3f1b..275b6e13bf 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -389,27 +389,16 @@ $result_nodes{'node_referenced_in_ref'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first-level-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-level-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -426,15 +415,13 @@ 
$result_nodes{'node_referenced_in_ref'}{'structure'}{'node_next'} = $result_node
 $result_menus{'node_referenced_in_ref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'first-level-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first-level-node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index 4b6ac896ea..6a5d088761 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -202,20 +202,16 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
@@ -241,23 +237,19 @@ $result_nodes{'node_sectop_before_chapter_no_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'node_sectop_before_chapter_no_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 37b648ae02..479ce7c5ae 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -379,12 +379,10 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'node-before',
-              'spaces_before_argument' => ' '
+              'normalized' => 'node-before'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -395,12 +393,10 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -425,8 +421,7 @@ 
$result_sectioning{'node_sectop_before_lone_node_Top'}{'structure'}{'section_chi
 $result_nodes{'node_sectop_before_lone_node_Top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -434,15 +429,12 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 0
           }
         },
-        'normalized' => 'node-before',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-before'
       },
       'structure' => {
         'node_next' => {
@@ -450,16 +442,13 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'chap',
-            'spaces_before_argument' => ' '
+            'normalized' => 'chap'
           },
           'structure' => {
             'node_up' => {}
@@ -476,8 +465,7 @@ 
$result_nodes{'node_sectop_before_lone_node_Top'}{'structure'}{'node_next'}{'str
 $result_menus{'node_sectop_before_lone_node_Top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index 16d3286154..f7db451ad2 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -118,8 +118,7 @@ $result_texts{'node_too_much_args'} = '';
 $result_nodes{'node_too_much_args'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_up' => {
@@ -137,8 +136,7 @@ $result_nodes{'node_too_much_args'} = {
 $result_menus{'node_too_much_args'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index 3ef542e9fb..8e3e98bc57 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -124,8 +124,7 @@ $result_texts{'node_up_direction_for_top_with_manual'} = '';
 $result_nodes{'node_up_direction_for_top_with_manual'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_up' => {
@@ -145,8 +144,7 @@ $result_nodes{'node_up_direction_for_top_with_manual'} = {
 $result_menus{'node_up_direction_for_top_with_manual'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 68d418fcc7..930b6abab5 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -392,20 +392,10 @@ $result_nodes{'node_up_external_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -420,8 +410,7 @@ $result_nodes{'node_up_external_node'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -524,8 +513,7 @@ 
$result_nodes{'node_up_external_node'}{'structure'}{'node_next'} = $result_nodes
 $result_menus{'node_up_external_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -540,8 +528,7 @@ $result_menus{'node_up_external_node'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -638,16 +625,14 @@ $result_elements{'node_up_external_node'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'first',
-              'spaces_before_argument' => ' '
+              'normalized' => 'first'
             },
             'structure' => {
               'associated_unit' => {
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 37af98fa5d..a521929883 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -981,12 +981,10 @@ $result_sectioning{'nodename_parentheses'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -997,12 +995,10 @@ $result_sectioning{'nodename_parentheses'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Node-_0028with-parentheses_0029',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Node-_0028with-parentheses_0029'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1018,12 +1014,10 @@ $result_sectioning{'nodename_parentheses'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Other-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Other-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1040,12 +1034,10 @@ $result_sectioning{'nodename_parentheses'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1081,9 +1073,7 @@ $result_nodes{'nodename_parentheses'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -1091,20 +1081,10 @@ $result_nodes{'nodename_parentheses'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1112,16 +1092,13 @@ $result_nodes{'nodename_parentheses'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'Node-_0028with-parentheses_0029',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Node-_0028with-parentheses_0029'
       },
       'structure' => {
         'node_next' => {
@@ -1129,16 +1106,13 @@ $result_nodes{'nodename_parentheses'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'Other-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Other-node'
           },
           'structure' => {
             'node_next' => {
@@ -1146,16 +1120,13 @@ $result_nodes{'nodename_parentheses'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 3
                   }
                 },
-                'normalized' => 'node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'node'
               },
               'structure' => {
                 'node_prev' => {},
@@ -1184,22 +1155,19 @@ 
$result_nodes{'nodename_parentheses'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'nodename_parentheses'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Node-_0028with-parentheses_0029',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Node-_0028with-parentheses_0029'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Other-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Other-node'
           },
           'structure' => {
             'menu_next' => {
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 0a224e45b5..4e5054f9a9 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
@@ -617,8 +617,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -634,8 +633,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'second-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'second-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -650,8 +648,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'Top',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'Top'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -693,8 +690,7 @@ $result_sectioning{'nodes_after_top_before_chapter_nodes'} 
= {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -741,20 +737,10 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -769,8 +755,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -779,9 +764,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {
                             'extra' => {
@@ -805,8 +788,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'third-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'third-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -886,8 +868,7 @@ 
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'structure'}{'node_next'}
 $result_menus{'nodes_after_top_before_chapter_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -902,16 +883,14 @@ $result_menus{'nodes_after_top_before_chapter_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'third-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'third-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -919,9 +898,7 @@ $result_menus{'nodes_after_top_before_chapter_nodes'} = {
                           'node' => {},
                           'section' => {
                             'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 1,
@@ -1028,16 +1005,14 @@ 
$result_elements{'nodes_after_top_before_chapter_nodes'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'second-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'second-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1053,8 +1028,7 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} 
= [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'third-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'third-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1067,9 +1041,7 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} 
= [
                         },
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
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 d6dae9ffb5..dc533a9595 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
@@ -572,12 +572,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -596,27 +594,16 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -624,16 +611,13 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} 
= {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -656,22 +640,19 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split'}{'structure'}{'node_nex
 $result_menus{'nodes_after_top_before_chapter_not_split'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
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 ac7b86044c..cbd597499b 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
@@ -572,12 +572,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directi
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -596,27 +594,16 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_next' => {
@@ -624,16 +611,13 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'node_prev' => {},
@@ -656,22 +640,19 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 
$result_menus{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'menu_prev' => {},
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 22075ad2d3..fbc4c9cbfd 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
@@ -595,8 +595,7 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -615,8 +614,7 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -643,20 +641,10 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -666,25 +654,21 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} 
= {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'second-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'second-node'
               },
               'structure' => {
                 'associated_unit' => {},
@@ -730,8 +714,7 @@ 
$result_nodes{'nodes_after_top_before_chapter_sections'}{'structure'}{'node_next
 $result_menus{'nodes_after_top_before_chapter_sections'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -739,16 +722,14 @@ $result_menus{'nodes_after_top_before_chapter_sections'} 
= {
         'node' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'second-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'second-node'
               },
               'structure' => {
                 'associated_unit' => {},
@@ -767,9 +748,7 @@ $result_menus{'nodes_after_top_before_chapter_sections'} = {
         },
         'section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1,
@@ -814,16 +793,14 @@ 
$result_elements{'nodes_after_top_before_chapter_sections'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'third-node',
-          'spaces_before_argument' => ' '
+          'normalized' => 'third-node'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_prev' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'second-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'second-node'
             },
             'structure' => {
               'associated_unit' => {},
@@ -831,8 +808,7 @@ $result_elements{'nodes_after_top_before_chapter_sections'} 
= [
               'menu_up' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'Top',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'Top'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -852,9 +828,7 @@ $result_elements{'nodes_after_top_before_chapter_sections'} 
= [
       },
       'section' => {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1,
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 f09de17793..2d849001f4 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
@@ -617,8 +617,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -634,8 +633,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'second-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'second-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -650,8 +648,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'Top',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'Top'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -694,8 +691,7 @@ $result_sectioning{'nodes_after_top_before_section_nodes'} 
= {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -742,20 +738,10 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -770,8 +756,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -780,9 +765,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'subsection',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {
                             'extra' => {
@@ -807,8 +790,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'third-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'third-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -888,8 +870,7 @@ 
$result_nodes{'nodes_after_top_before_section_nodes'}{'structure'}{'node_next'}
 $result_menus{'nodes_after_top_before_section_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -904,16 +885,14 @@ $result_menus{'nodes_after_top_before_section_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'third-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'third-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -921,9 +900,7 @@ $result_menus{'nodes_after_top_before_section_nodes'} = {
                           'node' => {},
                           'section' => {
                             'cmdname' => 'subsection',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 3,
@@ -1031,16 +1008,14 @@ 
$result_elements{'nodes_after_top_before_section_nodes'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'second-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'second-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1056,8 +1031,7 @@ $result_elements{'nodes_after_top_before_section_nodes'} 
= [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'third-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'third-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1070,9 +1044,7 @@ $result_elements{'nodes_after_top_before_section_nodes'} 
= [
                         },
                         'section' => {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 3,
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 0d38ec2e40..f741da9e53 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
@@ -595,8 +595,7 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'third-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'third-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -616,8 +615,7 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -644,20 +642,10 @@ $result_nodes{'nodes_after_top_before_section_sections'} 
= {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -667,25 +655,21 @@ $result_nodes{'nodes_after_top_before_section_sections'} 
= {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'subsection',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 3,
                 'number' => 1
               }
             },
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'associated_unit' => {},
             'node_prev' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'second-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'second-node'
               },
               'structure' => {
                 'associated_unit' => {},
@@ -732,8 +716,7 @@ 
$result_nodes{'nodes_after_top_before_section_sections'}{'structure'}{'node_next
 $result_menus{'nodes_after_top_before_section_sections'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -741,16 +724,14 @@ $result_menus{'nodes_after_top_before_section_sections'} 
= {
         'node' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'third-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'third-node'
           },
           'structure' => {
             'associated_unit' => {},
             'menu_prev' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'second-node',
-                'spaces_before_argument' => ' '
+                'normalized' => 'second-node'
               },
               'structure' => {
                 'associated_unit' => {},
@@ -769,9 +750,7 @@ $result_menus{'nodes_after_top_before_section_sections'} = {
         },
         'section' => {
           'cmdname' => 'subsection',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 3,
@@ -817,16 +796,14 @@ 
$result_elements{'nodes_after_top_before_section_sections'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'third-node',
-          'spaces_before_argument' => ' '
+          'normalized' => 'third-node'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_prev' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'second-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'second-node'
             },
             'structure' => {
               'associated_unit' => {},
@@ -834,8 +811,7 @@ $result_elements{'nodes_after_top_before_section_sections'} 
= [
               'menu_up' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'Top',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'Top'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -855,9 +831,7 @@ $result_elements{'nodes_after_top_before_section_sections'} 
= [
       },
       'section' => {
         'cmdname' => 'subsection',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 3,
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 1f4deb716c..218b198f98 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -460,12 +460,10 @@ $result_sectioning{'nodes_before_after_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -476,12 +474,10 @@ $result_sectioning{'nodes_before_after_top'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -508,15 +504,12 @@ $result_nodes{'nodes_before_after_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -524,16 +517,13 @@ $result_nodes{'nodes_before_after_top'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -548,8 +538,7 @@ 
$result_nodes{'nodes_before_after_top'}{'structure'}{'node_next'}{'structure'}{'
 $result_menus{'nodes_before_after_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 4551614348..9f638e8c6b 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -747,12 +747,10 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -763,12 +761,10 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chap',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chap'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -795,15 +791,12 @@ $result_nodes{'nodes_before_after_top_xref'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -811,16 +804,13 @@ $result_nodes{'nodes_before_after_top_xref'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chap',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chap'
       },
       'structure' => {
         'node_prev' => {},
@@ -835,8 +825,7 @@ 
$result_nodes{'nodes_before_after_top_xref'}{'structure'}{'node_next'}{'structur
 $result_menus{'nodes_before_after_top_xref'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index e7c7ed7b15..bfe0efb259 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -762,12 +762,10 @@ $result_sectioning{'nodes_before_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -778,12 +776,10 @@ $result_sectioning{'nodes_before_top'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'second-node',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'second-node'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -810,9 +806,7 @@ $result_nodes{'nodes_before_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -820,20 +814,10 @@ $result_nodes{'nodes_before_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -841,16 +825,13 @@ $result_nodes{'nodes_before_top'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_up' => {}
@@ -862,27 +843,16 @@ $result_nodes{'nodes_before_top'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'first',
-        'spaces_before_argument' => ' '
+        'normalized' => 'first'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node-in-menu-before-top',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-in-menu-before-top'
           },
           'structure' => {
             'node_up' => {}
@@ -909,15 +879,13 @@ 
$result_nodes{'nodes_before_top'}{'structure'}{'node_prev'}{'structure'}{'node_n
 $result_menus{'nodes_before_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_up' => {},
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 bd54eadcd1..2bbacad137 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
@@ -418,20 +418,10 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'first',
-    'spaces_before_argument' => ' '
+    'normalized' => 'first'
   },
   'structure' => {
     'associated_unit' => {
@@ -446,8 +436,7 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -516,8 +505,7 @@ 
$result_nodes{'nodes_no_node_top_explicit_directions'}{'structure'}{'node_up'}{'
 $result_menus{'nodes_no_node_top_explicit_directions'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'first',
-    'spaces_before_argument' => ' '
+    'normalized' => 'first'
   },
   'structure' => {
     'associated_unit' => {
@@ -532,8 +520,7 @@ $result_menus{'nodes_no_node_top_explicit_directions'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -605,16 +592,14 @@ $result_elements{'nodes_no_node_top_explicit_directions'} 
= [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'first',
-          'spaces_before_argument' => ' '
+          'normalized' => 'first'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'second-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'second-node'
             },
             'structure' => {
               'associated_unit' => {
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 4789a3c390..17d3c53ec8 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
@@ -671,8 +671,7 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -688,8 +687,7 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'first',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'first'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -718,8 +716,7 @@ $result_sectioning{'non_automatic_internal_top_node_up'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -753,9 +750,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -770,8 +765,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'first',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'first'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -806,20 +800,10 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -850,8 +834,7 @@ 
$result_nodes{'non_automatic_internal_top_node_up'}{'structure'}{'node_next'} =
 $result_menus{'non_automatic_internal_top_node_up'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -859,9 +842,7 @@ $result_menus{'non_automatic_internal_top_node_up'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -876,8 +857,7 @@ $result_menus{'non_automatic_internal_top_node_up'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -970,16 +950,14 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'first',
-              'spaces_before_argument' => ' '
+              'normalized' => 'first'
             },
             'structure' => {
               'associated_unit' => {
@@ -1008,9 +986,7 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
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 50c83478b8..bca76c955e 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
@@ -671,8 +671,7 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -688,8 +687,7 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'first',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'first'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -718,8 +716,7 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -753,9 +750,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -770,8 +765,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'first',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'first'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -806,20 +800,10 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -850,8 +834,7 @@ 
$result_nodes{'non_automatic_top_node_up_and_url'}{'structure'}{'node_next'} = $
 $result_menus{'non_automatic_top_node_up_and_url'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -859,9 +842,7 @@ $result_menus{'non_automatic_top_node_up_and_url'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -876,8 +857,7 @@ $result_menus{'non_automatic_top_node_up_and_url'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -970,16 +950,14 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'first',
-              'spaces_before_argument' => ' '
+              'normalized' => 'first'
             },
             'structure' => {
               'associated_unit' => {
@@ -1008,9 +986,7 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
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 03138cb987..abd2a2145f 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
@@ -486,8 +486,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -503,8 +502,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'first',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'first'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -519,13 +517,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
                           'NodeBack' => {},
                           'NodePrev' => {},
                           'NodeUp' => {
-                            'extra' => {
-                              'manual_content' => [
-                                {
-                                  'text' => 'dir'
-                                }
-                              ]
-                            },
+                            'extra' => {},
                             'type' => 'external_node'
                           },
                           'This' => {}
@@ -537,23 +529,11 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
                     'NodeForward' => {},
                     'NodeNext' => {},
                     'NodePrev' => {
-                      'extra' => {
-                        'manual_content' => [
-                          {
-                            'text' => 'dir'
-                          }
-                        ]
-                      },
+                      'extra' => {},
                       'type' => 'external_node'
                     },
                     'NodeUp' => {
-                      'extra' => {
-                        'manual_content' => [
-                          {
-                            'text' => 'dir'
-                          }
-                        ]
-                      },
+                      'extra' => {},
                       'type' => 'external_node'
                     },
                     'This' => {}
@@ -563,8 +543,7 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -598,9 +577,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -615,8 +592,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'first',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'first'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -687,20 +663,10 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -744,8 +710,7 @@ 
$result_nodes{'non_automatic_top_node_up_url'}{'structure'}{'node_up'}{'extra'}{
 $result_menus{'non_automatic_top_node_up_url'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -753,9 +718,7 @@ $result_menus{'non_automatic_top_node_up_url'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -770,8 +733,7 @@ $result_menus{'non_automatic_top_node_up_url'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -866,16 +828,14 @@ $result_elements{'non_automatic_top_node_up_url'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'first',
-              'spaces_before_argument' => ' '
+              'normalized' => 'first'
             },
             'structure' => {
               'associated_unit' => {
@@ -914,9 +874,7 @@ $result_elements{'non_automatic_top_node_up_url'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index e1589099d5..647e0bb40e 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -333,20 +333,10 @@ $result_nodes{'novalidate'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'first',
-    'spaces_before_argument' => ' '
+    'normalized' => 'first'
   },
   'structure' => {
     'node_next' => {
@@ -360,8 +350,7 @@ $result_nodes{'novalidate'} = {
 $result_menus{'novalidate'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'first',
-    'spaces_before_argument' => ' '
+    'normalized' => 'first'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index 2d00df8a31..4fc30ffd9b 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -256,8 +256,7 @@ ref to ref ref.
 $result_nodes{'one_node_explicit_directions_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'one-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'one-node'
   },
   'structure' => {
     'node_up' => {
@@ -276,8 +275,7 @@ $result_nodes{'one_node_explicit_directions_anchor'} = {
 $result_menus{'one_node_explicit_directions_anchor'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'one-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'one-node'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index 1cf18c5e95..51f3a2587c 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -63,9 +63,7 @@ $result_sectioning{'one_subsection'} = {
     'section_childs' => [
       {
         'cmdname' => 'subsection',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 3,
           'number' => 1,
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 00d47a0a53..6dc178f944 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -114,11 +114,9 @@ $result_sectioning{'one_subsection_and_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'one-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'one-node'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 3,
@@ -136,24 +134,20 @@ $result_nodes{'one_subsection_and_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'subsection',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 3,
         'number' => 1
       }
     },
-    'normalized' => 'one-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'one-node'
   }
 };
 
 $result_menus{'one_subsection_and_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'one-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'one-node'
   }
 };
 
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index 0fd94bbed3..735ea80d84 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -131,8 +131,7 @@ $result_sectioning{'part_before_chapter'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'associated_unit' => {
@@ -151,8 +150,7 @@ $result_sectioning{'part_before_chapter'} = {
               'number' => 1,
               'section_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -189,15 +187,12 @@ $result_elements{'part_before_chapter'} = [
         'extra' => {
           'associated_part' => {
             'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
+            'extra' => {},
             'structure' => {
               'associated_unit' => {},
               'level' => 0
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index e2e6b33059..3bf45fa031 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -131,8 +131,7 @@ $result_sectioning{'part_before_section'} = {
           'part_associated_section' => {
             'cmdname' => 'section',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'associated_unit' => {
@@ -151,8 +150,7 @@ $result_sectioning{'part_before_section'} = {
               'number' => 1,
               'section_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -199,15 +197,12 @@ $result_elements{'part_before_section'} = [
         'extra' => {
           'associated_part' => {
             'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
+            'extra' => {},
             'structure' => {
               'associated_unit' => {},
               'level' => 0
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index daf1b58cd9..bd5b4463c5 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -131,8 +131,7 @@ $result_sectioning{'part_before_top'} = {
           'part_associated_section' => {
             'cmdname' => 'top',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'associated_unit' => {
@@ -151,8 +150,7 @@ $result_sectioning{'part_before_top'} = {
               'section_prev' => {},
               'section_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -198,15 +196,12 @@ $result_elements{'part_before_top'} = [
         'extra' => {
           'associated_part' => {
             'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
+            'extra' => {},
             'structure' => {
               'associated_unit' => {},
               'level' => 0
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index bce18f4aef..68c77eb46a 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -431,8 +431,7 @@ $result_sectioning{'part_chapter_after_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -448,8 +447,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -462,8 +460,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -474,8 +471,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -512,8 +508,7 @@ $result_sectioning{'part_chapter_after_top'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -562,9 +557,7 @@ $result_nodes{'part_chapter_after_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -584,15 +577,12 @@ $result_nodes{'part_chapter_after_top'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -600,8 +590,7 @@ $result_nodes{'part_chapter_after_top'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -641,20 +630,10 @@ $result_nodes{'part_chapter_after_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -692,8 +671,7 @@ 
$result_nodes{'part_chapter_after_top'}{'structure'}{'node_next'} = $result_node
 $result_menus{'part_chapter_after_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -701,9 +679,7 @@ $result_menus{'part_chapter_after_top'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -718,8 +694,7 @@ $result_menus{'part_chapter_after_top'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -734,15 +709,12 @@ $result_menus{'part_chapter_after_top'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -813,16 +785,14 @@ $result_elements{'part_chapter_after_top'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter'
             },
             'structure' => {
               'associated_unit' => {
@@ -833,15 +803,12 @@ $result_elements{'part_chapter_after_top'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -873,9 +840,7 @@ $result_elements{'part_chapter_after_top'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index 577e143938..e4e0c74322 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -169,16 +169,14 @@ $result_sectioning{'part_chapter_appendix'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
               'number' => 1,
               'section_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -190,9 +188,7 @@ $result_sectioning{'part_chapter_appendix'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index bc50a59c9b..8e001915b0 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -380,8 +380,7 @@ $result_sectioning{'part_node_after_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -396,9 +395,7 @@ $result_sectioning{'part_node_after_top'} = {
                       'extra' => {
                         'section' => {
                           'cmdname' => 'part',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 0,
@@ -431,8 +428,7 @@ $result_sectioning{'part_node_after_top'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -472,9 +468,7 @@ $result_nodes{'part_node_after_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -488,9 +482,7 @@ $result_nodes{'part_node_after_top'} = {
                 'extra' => {
                   'section' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
@@ -526,28 +518,17 @@ $result_nodes{'part_node_after_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'part-node-after-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'part-node-after-top'
       },
       'structure' => {
         'associated_unit' => {},
@@ -584,8 +565,7 @@ 
$result_nodes{'part_node_after_top'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'part_node_after_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -593,9 +573,7 @@ $result_menus{'part_node_after_top'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -609,9 +587,7 @@ $result_menus{'part_node_after_top'} = {
             'extra' => {
               'section' => {
                 'cmdname' => 'part',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 0
@@ -644,8 +620,7 @@ $result_menus{'part_node_after_top'} = {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'part-node-after-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'part-node-after-top'
       },
       'structure' => {
         'associated_unit' => {},
@@ -708,16 +683,14 @@ $result_elements{'part_node_after_top'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'part-node-after-top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'part-node-after-top'
             },
             'structure' => {
               'associated_unit' => {},
@@ -731,9 +704,7 @@ $result_elements{'part_node_after_top'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -747,9 +718,7 @@ $result_elements{'part_node_after_top'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'part',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 0
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 8ef8de2b17..61b22dd9d8 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -423,8 +423,7 @@ $result_sectioning{'part_node_before_top'} = {
               'associated_node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'Top',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'Top'
                 },
                 'structure' => {
                   'associated_unit' => {
@@ -445,8 +444,7 @@ $result_sectioning{'part_node_before_top'} = {
                   }
                 }
               },
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'associated_unit' => {},
@@ -454,8 +452,7 @@ $result_sectioning{'part_node_before_top'} = {
               'section_prev' => {},
               'section_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -490,9 +487,7 @@ $result_nodes{'part_node_before_top'} = {
       'extra' => {
         'associated_part' => {
           'cmdname' => 'part',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {
               'extra' => {
@@ -512,8 +507,7 @@ $result_nodes{'part_node_before_top'} = {
             },
             'level' => 0
           }
-        },
-        'spaces_before_argument' => ' '
+        }
       },
       'structure' => {
         'associated_unit' => {},
@@ -523,28 +517,17 @@ $result_nodes{'part_node_before_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'part-node-before-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'part-node-before-top'
       },
       'structure' => {
         'associated_unit' => {},
@@ -574,8 +557,7 @@ 
$result_nodes{'part_node_before_top'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'part_node_before_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -586,15 +568,12 @@ $result_menus{'part_node_before_top'} = {
           'extra' => {
             'associated_part' => {
               'cmdname' => 'part',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 0
               }
-            },
-            'spaces_before_argument' => ' '
+            }
           },
           'structure' => {
             'associated_unit' => {},
@@ -616,8 +595,7 @@ $result_menus{'part_node_before_top'} = {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'part-node-before-top',
-        'spaces_before_argument' => ' '
+        'normalized' => 'part-node-before-top'
       },
       'structure' => {
         'associated_unit' => {},
@@ -671,16 +649,14 @@ $result_elements{'part_node_before_top'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'part-node-before-top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'part-node-before-top'
             },
             'structure' => {
               'associated_unit' => {},
@@ -697,15 +673,12 @@ $result_elements{'part_node_before_top'} = [
         'extra' => {
           'associated_part' => {
             'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
+            'extra' => {},
             'structure' => {
               'associated_unit' => {},
               'level' => 0
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
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 b4e31833d8..7e1de3c910 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -687,8 +687,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -704,8 +703,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -718,8 +716,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -730,8 +727,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -769,8 +765,7 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -820,9 +815,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -842,15 +835,12 @@ $result_nodes{'part_node_chapter_after_top'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -858,16 +848,14 @@ $result_nodes{'part_node_chapter_after_top'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'node_next' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'a-node-after-part',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'a-node-after-part'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -912,20 +900,10 @@ $result_nodes{'part_node_chapter_after_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -967,8 +945,7 @@ 
$result_nodes{'part_node_chapter_after_top'}{'structure'}{'node_next'} = $result
 $result_menus{'part_node_chapter_after_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -976,9 +953,7 @@ $result_menus{'part_node_chapter_after_top'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -993,16 +968,14 @@ $result_menus{'part_node_chapter_after_top'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_prev' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'a-node-after-part',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'a-node-after-part'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1024,15 +997,12 @@ $result_menus{'part_node_chapter_after_top'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -1108,16 +1078,14 @@ $result_elements{'part_node_chapter_after_top'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'a-node-after-part',
-              'spaces_before_argument' => ' '
+              'normalized' => 'a-node-after-part'
             },
             'structure' => {
               'associated_unit' => {
@@ -1125,8 +1093,7 @@ $result_elements{'part_node_chapter_after_top'} = [
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'chapter',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1142,15 +1109,12 @@ $result_elements{'part_node_chapter_after_top'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1184,9 +1148,7 @@ $result_elements{'part_node_chapter_after_top'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index add93dc8fa..1447ec38f1 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -489,8 +489,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -506,8 +505,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -520,8 +518,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -532,8 +529,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -554,9 +550,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'appendix',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 1,
@@ -602,8 +596,7 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -667,9 +660,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -689,15 +680,12 @@ $result_nodes{'part_node_chapter_appendix'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -705,8 +693,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -725,9 +712,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
                       'extra' => {
                         'section' => {
                           'cmdname' => 'appendix',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -774,20 +759,10 @@ $result_nodes{'part_node_chapter_appendix'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -834,8 +809,7 @@ 
$result_nodes{'part_node_chapter_appendix'}{'structure'}{'node_next'} = $result_
 $result_menus{'part_node_chapter_appendix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -843,9 +817,7 @@ $result_menus{'part_node_chapter_appendix'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -860,8 +832,7 @@ $result_menus{'part_node_chapter_appendix'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -876,15 +847,12 @@ $result_menus{'part_node_chapter_appendix'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -902,9 +870,7 @@ $result_menus{'part_node_chapter_appendix'} = {
                   'extra' => {
                     'section' => {
                       'cmdname' => 'appendix',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -992,16 +958,14 @@ $result_elements{'part_node_chapter_appendix'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1012,15 +976,12 @@ $result_elements{'part_node_chapter_appendix'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1038,9 +999,7 @@ $result_elements{'part_node_chapter_appendix'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'appendix',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -1078,9 +1037,7 @@ $result_elements{'part_node_chapter_appendix'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
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 63a77ec9f1..9a88701e45 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -609,8 +609,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -626,8 +625,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -640,8 +638,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -652,8 +649,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -675,8 +671,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'appendix-node',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'appendix-node'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -685,8 +680,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                               'section' => {
                                 'cmdname' => 'appendix',
                                 'extra' => {
-                                  'associated_node' => {},
-                                  'spaces_before_argument' => ' '
+                                  'associated_node' => {}
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -738,8 +732,7 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -810,9 +803,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -832,15 +823,12 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -848,8 +836,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -858,9 +845,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                         'extra' => {
                           'associated_section' => {
                             'cmdname' => 'appendix',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -886,8 +871,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                               'number' => 'A'
                             }
                           },
-                          'normalized' => 'appendix-node',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'appendix-node'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -936,20 +920,10 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -1006,8 +980,7 @@ 
$result_nodes{'part_node_chapter_node_appendix'}{'structure'}{'node_next'} = $re
 $result_menus{'part_node_chapter_node_appendix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1015,9 +988,7 @@ $result_menus{'part_node_chapter_node_appendix'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1032,16 +1003,14 @@ $result_menus{'part_node_chapter_node_appendix'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'appendix-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'appendix-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -1049,9 +1018,7 @@ $result_menus{'part_node_chapter_node_appendix'} = {
                           'node' => {},
                           'section' => {
                             'cmdname' => 'appendix',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 1,
@@ -1092,15 +1059,12 @@ $result_menus{'part_node_chapter_node_appendix'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -1194,16 +1158,14 @@ $result_elements{'part_node_chapter_node_appendix'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1214,15 +1176,12 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1241,8 +1200,7 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'appendix-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'appendix-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1255,9 +1213,7 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                         },
                         'section' => {
                           'cmdname' => 'appendix',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -1301,9 +1257,7 @@ $result_elements{'part_node_chapter_node_appendix'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
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 64116a0bf4..eff6843795 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -658,8 +658,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -675,8 +674,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -689,8 +687,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -701,8 +698,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -724,8 +720,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'appendix-part',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'appendix-part'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -738,8 +733,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                   'associated_part' => {
                                     'cmdname' => 'part',
                                     'extra' => {
-                                      'part_associated_section' => {},
-                                      'spaces_before_argument' => ' '
+                                      'part_associated_section' => {}
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
@@ -750,8 +744,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -801,8 +794,7 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -876,9 +868,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -898,15 +888,12 @@ $result_nodes{'part_node_node_part_appendix'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -914,8 +901,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -927,9 +913,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
                             'extra' => {
                               'associated_part' => {
                                 'cmdname' => 'part',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -952,8 +936,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
                                   },
                                   'level' => 0
                                 }
-                              },
-                              'spaces_before_argument' => ' '
+                              }
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -961,8 +944,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
                               'number' => 'A'
                             }
                           },
-                          'normalized' => 'appendix-part',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'appendix-part'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -1011,20 +993,10 @@ $result_nodes{'part_node_node_part_appendix'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -1081,8 +1053,7 @@ 
$result_nodes{'part_node_node_part_appendix'}{'structure'}{'node_next'} = $resul
 $result_menus{'part_node_node_part_appendix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1090,9 +1061,7 @@ $result_menus{'part_node_node_part_appendix'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1107,16 +1076,14 @@ $result_menus{'part_node_node_part_appendix'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'appendix-part',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'appendix-part'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -1127,15 +1094,12 @@ $result_menus{'part_node_node_part_appendix'} = {
                             'extra' => {
                               'associated_part' => {
                                 'cmdname' => 'part',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 0
                                 }
-                              },
-                              'spaces_before_argument' => ' '
+                              }
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -1176,15 +1140,12 @@ $result_menus{'part_node_node_part_appendix'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -1288,16 +1249,14 @@ $result_elements{'part_node_node_part_appendix'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1308,15 +1267,12 @@ $result_elements{'part_node_node_part_appendix'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1335,8 +1291,7 @@ $result_elements{'part_node_node_part_appendix'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'appendix-part',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'appendix-part'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1352,15 +1307,12 @@ $result_elements{'part_node_node_part_appendix'} = [
                           'extra' => {
                             'associated_part' => {
                               'cmdname' => 'part',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 0
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1404,9 +1356,7 @@ $result_elements{'part_node_node_part_appendix'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 5df23b18c4..04aaaf199b 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -538,8 +538,7 @@ $result_sectioning{'part_node_part_appendix'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -555,8 +554,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -569,8 +567,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -581,8 +578,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -607,8 +603,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                                   'associated_part' => {
                                     'cmdname' => 'part',
                                     'extra' => {
-                                      'part_associated_section' => {},
-                                      'spaces_before_argument' => ' '
+                                      'part_associated_section' => {}
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
@@ -619,8 +614,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -665,8 +659,7 @@ $result_sectioning{'part_node_part_appendix'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -733,9 +726,7 @@ $result_nodes{'part_node_part_appendix'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -755,15 +746,12 @@ $result_nodes{'part_node_part_appendix'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -771,8 +759,7 @@ $result_nodes{'part_node_part_appendix'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -794,15 +781,12 @@ $result_nodes{'part_node_part_appendix'} = {
                           'extra' => {
                             'associated_part' => {
                               'cmdname' => 'part',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 0
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -849,20 +833,10 @@ $result_nodes{'part_node_part_appendix'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -909,8 +883,7 @@ 
$result_nodes{'part_node_part_appendix'}{'structure'}{'node_next'} = $result_nod
 $result_menus{'part_node_part_appendix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -918,9 +891,7 @@ $result_menus{'part_node_part_appendix'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -935,8 +906,7 @@ $result_menus{'part_node_part_appendix'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -951,15 +921,12 @@ $result_menus{'part_node_part_appendix'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -980,15 +947,12 @@ $result_menus{'part_node_part_appendix'} = {
                       'extra' => {
                         'associated_part' => {
                           'cmdname' => 'part',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 0
                           }
-                        },
-                        'spaces_before_argument' => ' '
+                        }
                       },
                       'structure' => {
                         'associated_unit' => {},
@@ -1076,16 +1040,14 @@ $result_elements{'part_node_part_appendix'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1096,15 +1058,12 @@ $result_elements{'part_node_part_appendix'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1125,15 +1084,12 @@ $result_elements{'part_node_part_appendix'} = [
                           'extra' => {
                             'associated_part' => {
                               'cmdname' => 'part',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 0
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1171,9 +1127,7 @@ $result_elements{'part_node_part_appendix'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
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 e63eb5e052..d7fd626210 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -658,8 +658,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -675,8 +674,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-node'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -689,8 +687,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                             'associated_part' => {
                               'cmdname' => 'part',
                               'extra' => {
-                                'part_associated_section' => {},
-                                'spaces_before_argument' => ' '
+                                'part_associated_section' => {}
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -701,8 +698,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -724,8 +720,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'appendix-node',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'appendix-node'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -738,8 +733,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                   'associated_part' => {
                                     'cmdname' => 'part',
                                     'extra' => {
-                                      'part_associated_section' => {},
-                                      'spaces_before_argument' => ' '
+                                      'part_associated_section' => {}
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
@@ -750,8 +744,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
-                                  },
-                                  'spaces_before_argument' => ' '
+                                  }
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -801,8 +794,7 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -876,9 +868,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -898,15 +888,12 @@ $result_nodes{'part_node_part_node_appendix'} = {
                         'extra' => {
                           'associated_part' => {
                             'cmdname' => 'part',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 0
                             }
-                          },
-                          'spaces_before_argument' => ' '
+                          }
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -914,8 +901,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-node'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -927,9 +913,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
                             'extra' => {
                               'associated_part' => {
                                 'cmdname' => 'part',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -952,8 +936,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
                                   },
                                   'level' => 0
                                 }
-                              },
-                              'spaces_before_argument' => ' '
+                              }
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -961,8 +944,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
                               'number' => 'A'
                             }
                           },
-                          'normalized' => 'appendix-node',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'appendix-node'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -1011,20 +993,10 @@ $result_nodes{'part_node_part_node_appendix'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -1081,8 +1053,7 @@ 
$result_nodes{'part_node_part_node_appendix'}{'structure'}{'node_next'} = $resul
 $result_menus{'part_node_part_node_appendix'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1090,9 +1061,7 @@ $result_menus{'part_node_part_node_appendix'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1107,16 +1076,14 @@ $result_menus{'part_node_part_node_appendix'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-node',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-node'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'appendix-node',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'appendix-node'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -1127,15 +1094,12 @@ $result_menus{'part_node_part_node_appendix'} = {
                             'extra' => {
                               'associated_part' => {
                                 'cmdname' => 'part',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 0
                                 }
-                              },
-                              'spaces_before_argument' => ' '
+                              }
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -1176,15 +1140,12 @@ $result_menus{'part_node_part_node_appendix'} = {
                 'extra' => {
                   'associated_part' => {
                     'cmdname' => 'part',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
                     }
-                  },
-                  'spaces_before_argument' => ' '
+                  }
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -1278,16 +1239,14 @@ $result_elements{'part_node_part_node_appendix'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -1298,15 +1257,12 @@ $result_elements{'part_node_part_node_appendix'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1325,8 +1281,7 @@ $result_elements{'part_node_part_node_appendix'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'appendix-node',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'appendix-node'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1342,15 +1297,12 @@ $result_elements{'part_node_part_node_appendix'} = [
                           'extra' => {
                             'associated_part' => {
                               'cmdname' => 'part',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 0
                               }
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -1394,9 +1346,7 @@ $result_elements{'part_node_part_node_appendix'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 0064663c7b..d499485b6c 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -931,9 +931,7 @@ $result_sectioning{'placed_things_before_element'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -963,16 +961,7 @@ $result_floats{'placed_things_before_element'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float-anchor',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index a0a5211863..dfcb6799ea 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -982,11 +982,9 @@ $result_sectioning{'placed_things_before_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1003,23 +1001,19 @@ $result_nodes{'placed_things_before_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'placed_things_before_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
@@ -1041,16 +1035,7 @@ $result_floats{'placed_things_before_node'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'float-anchor',
-        'spaces_before_argument' => ' ',
         'type' => {
           'normalized' => ''
         }
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 6ac5c9cebd..b3900ae3ae 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -541,12 +541,10 @@ $result_sectioning{'protected_node_parentheses'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -563,9 +561,7 @@ $result_nodes{'protected_node_parentheses'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -573,27 +569,16 @@ $result_nodes{'protected_node_parentheses'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_0028manual_0029-name',
-        'spaces_before_argument' => ' '
+        'normalized' => '_0028manual_0029-name'
       },
       'structure' => {
         'node_prev' => {},
@@ -610,15 +595,13 @@ 
$result_nodes{'protected_node_parentheses'}{'structure'}{'node_next'} = $result_
 $result_menus{'protected_node_parentheses'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => '_0028manual_0029-name',
-        'spaces_before_argument' => ' '
+        'normalized' => '_0028manual_0029-name'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index 22d7ce6417..19cf66152c 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -1474,8 +1474,7 @@ $result_sectioning{'raiselowersections'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
           }
@@ -1489,12 +1488,10 @@ $result_sectioning{'raiselowersections'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1506,13 +1503,11 @@ $result_sectioning{'raiselowersections'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'Chapter-in-included-file',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'Chapter-in-included-file'
                         },
                         'structure' => {}
                       },
-                      'sections_level' => -1,
-                      'spaces_before_argument' => ' '
+                      'sections_level' => -1
                     },
                     'structure' => {
                       'level' => 2,
@@ -1524,13 +1519,11 @@ $result_sectioning{'raiselowersections'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'Section',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'Section'
                               },
                               'structure' => {}
                             },
-                            'sections_level' => -1,
-                            'spaces_before_argument' => ' '
+                            'sections_level' => -1
                           },
                           'structure' => {
                             'level' => 3,
@@ -1542,13 +1535,11 @@ $result_sectioning{'raiselowersections'} = {
                                   'associated_node' => {
                                     'cmdname' => 'node',
                                     'extra' => {
-                                      'normalized' => 'Subsection',
-                                      'spaces_before_argument' => ' '
+                                      'normalized' => 'Subsection'
                                     },
                                     'structure' => {}
                                   },
-                                  'sections_level' => -1,
-                                  'spaces_before_argument' => ' '
+                                  'sections_level' => -1
                                 },
                                 'structure' => {
                                   'level' => 4,
@@ -1576,12 +1567,10 @@ $result_sectioning{'raiselowersections'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Second-chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Second-chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -1624,20 +1613,10 @@ $result_nodes{'raiselowersections'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1645,9 +1624,7 @@ $result_nodes{'raiselowersections'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -1656,20 +1633,10 @@ $result_nodes{'raiselowersections'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'Chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -1678,8 +1645,7 @@ $result_nodes{'raiselowersections'} = {
             'associated_section' => {
               'cmdname' => 'chapter',
               'extra' => {
-                'sections_level' => -1,
-                'spaces_before_argument' => ' '
+                'sections_level' => -1
               },
               'structure' => {
                 'level' => 2,
@@ -1689,20 +1655,10 @@ $result_nodes{'raiselowersections'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'Chapter-in-included-file',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Chapter-in-included-file'
           },
           'structure' => {
             'menu_child' => {
@@ -1711,8 +1667,7 @@ $result_nodes{'raiselowersections'} = {
                 'associated_section' => {
                   'cmdname' => 'section',
                   'extra' => {
-                    'sections_level' => -1,
-                    'spaces_before_argument' => ' '
+                    'sections_level' => -1
                   },
                   'structure' => {
                     'level' => 3,
@@ -1722,20 +1677,10 @@ $result_nodes{'raiselowersections'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'Section',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Section'
               },
               'structure' => {
                 'menu_child' => {
@@ -1744,16 +1689,14 @@ $result_nodes{'raiselowersections'} = {
                     'associated_section' => {
                       'cmdname' => 'subsection',
                       'extra' => {
-                        'sections_level' => -1,
-                        'spaces_before_argument' => ' '
+                        'sections_level' => -1
                       },
                       'structure' => {
                         'level' => 4,
                         'number' => '1.1.1.1'
                       }
                     },
-                    'normalized' => 'Subsection',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Subsection'
                   },
                   'structure' => {
                     'node_up' => {}
@@ -1770,16 +1713,13 @@ $result_nodes{'raiselowersections'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'Second-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Second-chapter'
           },
           'structure' => {
             'node_prev' => {},
@@ -1805,36 +1745,31 @@ 
$result_nodes{'raiselowersections'}{'structure'}{'node_next'} = $result_nodes{'r
 $result_menus{'raiselowersections'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Chapter-in-included-file',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Chapter-in-included-file'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Section',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Section'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Subsection',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Subsection'
                   },
                   'structure' => {
                     'menu_up' => {},
@@ -1858,8 +1793,7 @@ $result_menus{'raiselowersections'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Second-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Second-chapter'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/rec_nodes.pl 
b/tp/t/results/sectioning/rec_nodes.pl
index 209d9afd06..53a34a565f 100644
--- a/tp/t/results/sectioning/rec_nodes.pl
+++ b/tp/t/results/sectioning/rec_nodes.pl
@@ -1331,20 +1331,10 @@ $result_nodes{'rec_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -1353,20 +1343,10 @@ $result_nodes{'rec_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_child' => {
@@ -1375,20 +1355,10 @@ $result_nodes{'rec_nodes'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'other-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'other-node'
           },
           'structure' => {
             'menu_child' => {},
@@ -1411,22 +1381,19 @@ $result_nodes{'rec_nodes'}{'structure'}{'node_next'} = 
$result_nodes{'rec_nodes'
 $result_menus{'rec_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'other-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'other-node'
           },
           'structure' => {
             'menu_child' => {},
@@ -1441,15 +1408,13 @@ $result_menus{'rec_nodes'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'node-following-second',
-            'spaces_before_argument' => ' '
+            'normalized' => 'node-following-second'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'node-up-node-following-second',
-                'spaces_before_argument' => ' '
+                'normalized' => 'node-up-node-following-second'
               },
               'structure' => {
                 'menu_child' => {},
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index d7050a215b..bb9d676c29 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -185,11 +185,9 @@ $result_sectioning{'ref_to_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -206,23 +204,19 @@ $result_nodes{'ref_to_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'ref_to_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index f41e1c1942..0d412a3d4d 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -268,9 +268,7 @@ $result_sectioning{'section_before_after_top_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_up' => {}
@@ -282,11 +280,9 @@ $result_sectioning{'section_before_after_top_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -297,9 +293,7 @@ $result_sectioning{'section_before_after_top_node'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 1,
@@ -326,23 +320,19 @@ $result_nodes{'section_before_after_top_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'section_before_after_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index 683db5c865..1c1af1a250 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -324,9 +324,7 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_up' => {}
@@ -338,12 +336,10 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 1,
@@ -354,9 +350,7 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 1,
@@ -383,22 +377,18 @@ $result_nodes{'section_before_after_top_node_last_node'} 
= {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 1
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node-after',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node-after'
       },
       'structure' => {
         'node_prev' => {}
@@ -411,8 +401,7 @@ 
$result_nodes{'section_before_after_top_node_last_node'}{'structure'}{'node_next
 $result_menus{'section_before_after_top_node_last_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index a5edab69c9..ca82d39b2f 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -108,9 +108,7 @@ $result_sectioning{'section_before_chapter'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -119,9 +117,7 @@ $result_sectioning{'section_before_chapter'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 2,
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 542bd8194f..42cc42ff32 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -138,9 +138,7 @@ $result_sectioning{'section_before_part'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -149,9 +147,7 @@ $result_sectioning{'section_before_part'} = {
       },
       {
         'cmdname' => 'part',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index b633a046ff..04980f7b37 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -380,12 +380,10 @@ $result_sectioning{'section_before_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'section-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'section-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 2,
@@ -399,12 +397,10 @@ $result_sectioning{'section_before_top'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 2,
@@ -426,9 +422,7 @@ $result_nodes{'section_before_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 2
       }
@@ -436,20 +430,10 @@ $result_nodes{'section_before_top'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -457,16 +441,13 @@ $result_nodes{'section_before_top'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'section',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2,
             'number' => 1
           }
         },
-        'normalized' => 'section-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'section-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -483,15 +464,13 @@ 
$result_nodes{'section_before_top'}{'structure'}{'node_next'} = $result_nodes{'s
 $result_menus{'section_before_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'section-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'section-node'
       },
       'structure' => {
         'menu_up' => {},
diff --git a/tp/t/results/sectioning/section_before_top_no_node.pl 
b/tp/t/results/sectioning/section_before_top_no_node.pl
index 70e751500a..b0c92e3395 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -108,9 +108,7 @@ $result_sectioning{'section_before_top_no_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -119,9 +117,7 @@ $result_sectioning{'section_before_top_no_node'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 2f85b8f1ae..235e471c6d 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -699,12 +699,10 @@ $result_sectioning{'section_below_unnumbered'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -715,12 +713,10 @@ $result_sectioning{'section_below_unnumbered'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Unn',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Unn'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -731,12 +727,10 @@ $result_sectioning{'section_below_unnumbered'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'Sec',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'Sec'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -767,9 +761,7 @@ $result_nodes{'section_below_unnumbered'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -777,20 +769,10 @@ $result_nodes{'section_below_unnumbered'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -798,9 +780,7 @@ $result_nodes{'section_below_unnumbered'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1
           }
@@ -808,20 +788,10 @@ $result_nodes{'section_below_unnumbered'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'Unn',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Unn'
       },
       'structure' => {
         'menu_child' => {
@@ -829,15 +799,12 @@ $result_nodes{'section_below_unnumbered'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2
               }
             },
-            'normalized' => 'Sec',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Sec'
           },
           'structure' => {
             'node_up' => {}
@@ -858,22 +825,19 @@ 
$result_nodes{'section_below_unnumbered'}{'structure'}{'node_next'} = $result_no
 $result_menus{'section_below_unnumbered'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Unn',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Unn'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Sec',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Sec'
           },
           'structure' => {
             'menu_up' => {},
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index 6687a95acb..c691a63dc7 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -98,17 +98,13 @@ $result_sectioning{'section_below_unnumbered_no_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'section_up' => {}
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index 1b5eef0e98..ee5a2c861f 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -153,9 +153,7 @@ $result_sectioning{'section_chapter_before_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'section',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 1,
@@ -164,9 +162,7 @@ $result_sectioning{'section_chapter_before_top'} = {
       },
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'number' => 2,
@@ -177,9 +173,7 @@ $result_sectioning{'section_chapter_before_top'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 2,
           'section_prev' => {},
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 9ce7623542..07d3bf64c2 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -631,12 +631,10 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'section-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'section-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 2,
@@ -650,12 +648,10 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-node'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 2,
@@ -671,12 +667,10 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 2,
@@ -701,9 +695,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 2
       }
@@ -711,20 +703,10 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -732,9 +714,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 2,
             'number' => 2
@@ -743,20 +723,10 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-node'
       },
       'structure' => {
         'menu_child' => {
@@ -764,16 +734,13 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 1
               }
             },
-            'normalized' => 'section-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-node'
           },
           'structure' => {
             'node_next' => {},
@@ -798,22 +765,19 @@ 
$result_nodes{'section_chapter_before_top_nodes'}{'structure'}{'node_next'} = $r
 $result_menus{'section_chapter_before_top_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter-node'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section-node',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-node'
           },
           'structure' => {
             'menu_up' => {},
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index dcb8bd0edc..ae2108e32d 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -6100,12 +6100,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -6116,12 +6114,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6133,12 +6129,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-in-chapter',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-in-chapter'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6158,12 +6152,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumbered'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6174,12 +6166,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-in-unnumbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-in-unnumbered'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6199,12 +6189,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6216,12 +6204,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6232,12 +6218,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6250,12 +6234,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6269,12 +6251,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6288,12 +6268,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6311,12 +6289,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-2_002d1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-2_002d1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6327,12 +6303,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-2_002d1',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-2_002d1'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6357,12 +6331,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-3'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6374,12 +6346,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-3',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-3'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6390,12 +6360,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6408,12 +6376,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6427,12 +6393,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6446,12 +6410,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6469,12 +6431,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-3_002d1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-3_002d1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6489,12 +6449,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-3_002d2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-3_002d2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6505,12 +6463,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3_002d2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3_002d2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6528,12 +6484,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-3_002d3',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-3_002d3'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6545,12 +6499,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection-3_002d3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-3_002d3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6569,12 +6521,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-3_002d4',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-3_002d4'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6585,12 +6535,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3_002d4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3_002d4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6615,12 +6563,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumbered-4',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumbered-4'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6631,12 +6577,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-4',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-4'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6647,12 +6591,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6665,12 +6607,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6684,12 +6624,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6703,12 +6641,10 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6800,9 +6736,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -6810,20 +6744,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -6831,9 +6755,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -6842,20 +6764,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -6863,16 +6775,13 @@ $result_nodes{'section_in_unnumbered_info'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
               }
             },
-            'normalized' => 'section-in-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-in-chapter'
           },
           'structure' => {
             'node_up' => {}
@@ -6883,9 +6792,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1
               }
@@ -6893,20 +6800,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'unnumbered'
           },
           'structure' => {
             'menu_child' => {
@@ -6914,15 +6811,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2
                   }
                 },
-                'normalized' => 'section-in-unnumbered',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-in-unnumbered'
               },
               'structure' => {
                 'node_up' => {}
@@ -6933,9 +6827,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 2
@@ -6944,20 +6836,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'chapter-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-2'
               },
               'structure' => {
                 'menu_child' => {
@@ -6965,9 +6847,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2
                       }
@@ -6975,20 +6855,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     'menus' => [
                       {
                         'cmdname' => 'menu',
-                        'extra' => {
-                          'end_command' => {
-                            'cmdname' => 'end',
-                            'extra' => {
-                              'command_argument' => 'menu',
-                              'spaces_before_argument' => ' ',
-                              'text_arg' => 'menu'
-                            }
-                          }
-                        }
+                        'extra' => {}
                       }
                     ],
-                    'normalized' => 'unnumberedsec-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumberedsec-2'
                   },
                   'structure' => {
                     'menu_child' => {
@@ -6996,15 +6866,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsubsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3
                           }
                         },
-                        'normalized' => 'unnumbered-sub-2',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-sub-2'
                       },
                       'structure' => {
                         'node_next' => {
@@ -7012,15 +6879,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'subsection',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'numbered-sub-2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2'
                           },
                           'structure' => {
                             'node_next' => {
@@ -7028,15 +6892,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 3
                                   }
                                 },
-                                'normalized' => 'unnumbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-2'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -7044,15 +6905,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'numbered-sub2-2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub2-2'
                                   },
                                   'structure' => {
                                     'node_prev' => {},
@@ -7075,9 +6933,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 2
                           }
@@ -7085,20 +6941,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'unnumberedsec-2_002d1',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-2_002d1'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -7106,15 +6952,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'subsection',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'numbered-sub-2_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2_002d1'
                           },
                           'structure' => {
                             'node_up' => {}
@@ -7132,9 +6975,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 3
@@ -7143,20 +6984,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     'menus' => [
                       {
                         'cmdname' => 'menu',
-                        'extra' => {
-                          'end_command' => {
-                            'cmdname' => 'end',
-                            'extra' => {
-                              'command_argument' => 'menu',
-                              'spaces_before_argument' => ' ',
-                              'text_arg' => 'menu'
-                            }
-                          }
-                        }
+                        'extra' => {}
                       }
                     ],
-                    'normalized' => 'chapter-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-3'
                   },
                   'structure' => {
                     'menu_child' => {
@@ -7164,9 +6995,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 2
                           }
@@ -7174,20 +7003,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'unnumberedsec-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-3'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -7195,15 +7014,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsubsec',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'unnumbered-sub-3',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumbered-sub-3'
                           },
                           'structure' => {
                             'node_next' => {
@@ -7211,15 +7027,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'subsection',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 3
                                   }
                                 },
-                                'normalized' => 'numbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -7227,15 +7040,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'unnumberedsubsec',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'unnumbered-sub2-3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'unnumbered-sub2-3'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -7243,15 +7053,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 3
                                           }
                                         },
-                                        'normalized' => 'numbered-sub2-3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'numbered-sub2-3'
                                       },
                                       'structure' => {
                                         'node_prev' => {},
@@ -7274,16 +7081,13 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'section',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 2,
                                 'number' => '3.1'
                               }
                             },
-                            'normalized' => 'section-3_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'section-3_002d1'
                           },
                           'structure' => {
                             'node_next' => {
@@ -7291,9 +7095,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsec',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 2
                                   }
@@ -7301,20 +7103,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 'menus' => [
                                   {
                                     'cmdname' => 'menu',
-                                    'extra' => {
-                                      'end_command' => {
-                                        'cmdname' => 'end',
-                                        'extra' => {
-                                          'command_argument' => 'menu',
-                                          'spaces_before_argument' => ' ',
-                                          'text_arg' => 'menu'
-                                        }
-                                      }
-                                    }
+                                    'extra' => {}
                                   }
                                 ],
-                                'normalized' => 'unnumberedsec-3_002d2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumberedsec-3_002d2'
                               },
                               'structure' => {
                                 'menu_child' => {
@@ -7322,15 +7114,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'numbered-sub-3_002d2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-3_002d2'
                                   },
                                   'structure' => {
                                     'node_up' => {}
@@ -7341,9 +7130,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'section',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 2,
                                         'number' => '3.2'
@@ -7352,20 +7139,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     'menus' => [
                                       {
                                         'cmdname' => 'menu',
-                                        'extra' => {
-                                          'end_command' => {
-                                            'cmdname' => 'end',
-                                            'extra' => {
-                                              'command_argument' => 'menu',
-                                              'spaces_before_argument' => ' ',
-                                              'text_arg' => 'menu'
-                                            }
-                                          }
-                                        }
+                                        'extra' => {}
                                       }
                                     ],
-                                    'normalized' => 'section-3_002d3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'section-3_002d3'
                                   },
                                   'structure' => {
                                     'menu_child' => {
@@ -7373,16 +7150,13 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 3,
                                             'number' => '3.2.1'
                                           }
                                         },
-                                        'normalized' => 'subsection-3_002d3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'subsection-3_002d3'
                                       },
                                       'structure' => {
                                         'node_up' => {}
@@ -7393,9 +7167,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsec',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 2
                                           }
@@ -7403,20 +7175,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         'menus' => [
                                           {
                                             'cmdname' => 'menu',
-                                            'extra' => {
-                                              'end_command' => {
-                                                'cmdname' => 'end',
-                                                'extra' => {
-                                                  'command_argument' => 'menu',
-                                                  'spaces_before_argument' => 
' ',
-                                                  'text_arg' => 'menu'
-                                                }
-                                              }
-                                            }
+                                            'extra' => {}
                                           }
                                         ],
-                                        'normalized' => 
'unnumberedsec-3_002d4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumberedsec-3_002d4'
                                       },
                                       'structure' => {
                                         'menu_child' => {
@@ -7424,15 +7186,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 3
                                               }
                                             },
-                                            'normalized' => 
'numbered-sub-3_002d4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'numbered-sub-3_002d4'
                                           },
                                           'structure' => {
                                             'node_up' => {}
@@ -7462,9 +7221,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumbered',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1
                           }
@@ -7472,20 +7229,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'unnumbered-4',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-4'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -7493,9 +7240,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsec',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 2
                               }
@@ -7503,20 +7248,10 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             'menus' => [
                               {
                                 'cmdname' => 'menu',
-                                'extra' => {
-                                  'end_command' => {
-                                    'cmdname' => 'end',
-                                    'extra' => {
-                                      'command_argument' => 'menu',
-                                      'spaces_before_argument' => ' ',
-                                      'text_arg' => 'menu'
-                                    }
-                                  }
-                                }
+                                'extra' => {}
                               }
                             ],
-                            'normalized' => 'unnumberedsec-4',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumberedsec-4'
                           },
                           'structure' => {
                             'menu_child' => {
@@ -7524,15 +7259,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 3
                                   }
                                 },
-                                'normalized' => 'unnumbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-4'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -7540,15 +7272,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'numbered-sub-4',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-4'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -7556,15 +7285,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsubsec',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 3
                                           }
                                         },
-                                        'normalized' => 'unnumbered-sub2-4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumbered-sub2-4'
                                       },
                                       'structure' => {
                                         'node_next' => {
@@ -7572,15 +7298,12 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 3
                                               }
                                             },
-                                            'normalized' => 'numbered-sub2-4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'numbered-sub2-4'
                                           },
                                           'structure' => {
                                             'node_prev' => {},
@@ -7679,22 +7402,19 @@ 
$result_nodes{'section_in_unnumbered_info'}{'structure'}{'node_next'} = $result_
 $result_menus{'section_in_unnumbered_info'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section-in-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-in-chapter'
           },
           'structure' => {
             'menu_up' => {},
@@ -7706,15 +7426,13 @@ $result_menus{'section_in_unnumbered_info'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'unnumbered'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-in-unnumbered',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-in-unnumbered'
               },
               'structure' => {
                 'menu_up' => {},
@@ -7726,43 +7444,37 @@ $result_menus{'section_in_unnumbered_info'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-2'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumberedsec-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumberedsec-2'
                   },
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumbered-sub-2',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-sub-2'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'numbered-sub-2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-2'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'numbered-sub2-2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub2-2'
                                   },
                                   'structure' => {
                                     'menu_prev' => {},
@@ -7795,15 +7507,13 @@ $result_menus{'section_in_unnumbered_info'} = {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumberedsec-2_002d1',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-2_002d1'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'numbered-sub-2_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2_002d1'
                           },
                           'structure' => {
                             'menu_up' => {},
@@ -7828,43 +7538,37 @@ $result_menus{'section_in_unnumbered_info'} = {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-3'
                   },
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumberedsec-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-3'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'unnumbered-sub-3',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumbered-sub-3'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'unnumbered-sub2-3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'unnumbered-sub2-3'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'numbered-sub2-3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'numbered-sub2-3'
                                       },
                                       'structure' => {
                                         'menu_prev' => {},
@@ -7897,22 +7601,19 @@ $result_menus{'section_in_unnumbered_info'} = {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'section-3_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'section-3_002d1'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumberedsec-3_002d2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumberedsec-3_002d2'
                               },
                               'structure' => {
                                 'menu_child' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'numbered-sub-3_002d2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-3_002d2'
                                   },
                                   'structure' => {
                                     'menu_up' => {},
@@ -7924,15 +7625,13 @@ $result_menus{'section_in_unnumbered_info'} = {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'section-3_002d3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'section-3_002d3'
                                   },
                                   'structure' => {
                                     'menu_child' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'subsection-3_002d3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'subsection-3_002d3'
                                       },
                                       'structure' => {
                                         'menu_up' => {},
@@ -7944,15 +7643,13 @@ $result_menus{'section_in_unnumbered_info'} = {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'unnumberedsec-3_002d4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumberedsec-3_002d4'
                                       },
                                       'structure' => {
                                         'menu_child' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'numbered-sub-3_002d4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'numbered-sub-3_002d4'
                                           },
                                           'structure' => {
                                             'menu_up' => {},
@@ -7998,43 +7695,37 @@ $result_menus{'section_in_unnumbered_info'} = {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumbered-4',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-4'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'unnumberedsec-4',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumberedsec-4'
                           },
                           'structure' => {
                             'menu_child' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-4'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'numbered-sub-4',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-4'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'unnumbered-sub2-4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumbered-sub2-4'
                                       },
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 'numbered-sub2-4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'numbered-sub2-4'
                                           },
                                           'structure' => {
                                             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 6415b413cf..8a25b44d34 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -6100,12 +6100,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -6116,12 +6114,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6133,12 +6129,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-in-chapter',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-in-chapter'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6158,12 +6152,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumbered',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumbered'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6174,12 +6166,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-in-unnumbered',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-in-unnumbered'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6199,12 +6189,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-2'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6216,12 +6204,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6232,12 +6218,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6250,12 +6234,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6269,12 +6251,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6288,12 +6268,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2-2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6311,12 +6289,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-2_002d1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-2_002d1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6327,12 +6303,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-2_002d1',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-2_002d1'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6357,12 +6331,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-3'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6374,12 +6346,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-3',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-3'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6390,12 +6360,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6408,12 +6376,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6427,12 +6393,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6446,12 +6410,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2-3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6469,12 +6431,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-3_002d1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-3_002d1'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6489,12 +6449,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-3_002d2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-3_002d2'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6505,12 +6463,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3_002d2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3_002d2'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6528,12 +6484,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'section-3_002d3',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'section-3_002d3'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6545,12 +6499,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'subsection-3_002d3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'subsection-3_002d3'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6569,12 +6521,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-3_002d4',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-3_002d4'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6585,12 +6535,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3_002d4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3_002d4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6615,12 +6563,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumbered-4',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumbered-4'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -6631,12 +6577,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'unnumberedsec-4',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'unnumberedsec-4'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -6647,12 +6591,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6665,12 +6607,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6684,12 +6624,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6703,12 +6641,10 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             'associated_node' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub2-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub2-4'
                               },
                               'structure' => {}
-                            },
-                            'spaces_before_argument' => ' '
+                            }
                           },
                           'structure' => {
                             'level' => 3,
@@ -6800,9 +6736,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -6810,20 +6744,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -6831,9 +6755,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -6842,20 +6764,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
@@ -6863,16 +6775,13 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
               }
             },
-            'normalized' => 'section-in-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-in-chapter'
           },
           'structure' => {
             'node_up' => {}
@@ -6883,9 +6792,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1
               }
@@ -6893,20 +6800,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
             'menus' => [
               {
                 'cmdname' => 'menu',
-                'extra' => {
-                  'end_command' => {
-                    'cmdname' => 'end',
-                    'extra' => {
-                      'command_argument' => 'menu',
-                      'spaces_before_argument' => ' ',
-                      'text_arg' => 'menu'
-                    }
-                  }
-                }
+                'extra' => {}
               }
             ],
-            'normalized' => 'unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'unnumbered'
           },
           'structure' => {
             'menu_child' => {
@@ -6914,15 +6811,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2
                   }
                 },
-                'normalized' => 'section-in-unnumbered',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-in-unnumbered'
               },
               'structure' => {
                 'node_up' => {}
@@ -6933,9 +6827,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'chapter',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 1,
                     'number' => 2
@@ -6944,20 +6836,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                 'menus' => [
                   {
                     'cmdname' => 'menu',
-                    'extra' => {
-                      'end_command' => {
-                        'cmdname' => 'end',
-                        'extra' => {
-                          'command_argument' => 'menu',
-                          'spaces_before_argument' => ' ',
-                          'text_arg' => 'menu'
-                        }
-                      }
-                    }
+                    'extra' => {}
                   }
                 ],
-                'normalized' => 'chapter-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-2'
               },
               'structure' => {
                 'menu_child' => {
@@ -6965,9 +6847,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'unnumberedsec',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 2
                       }
@@ -6975,20 +6855,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     'menus' => [
                       {
                         'cmdname' => 'menu',
-                        'extra' => {
-                          'end_command' => {
-                            'cmdname' => 'end',
-                            'extra' => {
-                              'command_argument' => 'menu',
-                              'spaces_before_argument' => ' ',
-                              'text_arg' => 'menu'
-                            }
-                          }
-                        }
+                        'extra' => {}
                       }
                     ],
-                    'normalized' => 'unnumberedsec-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumberedsec-2'
                   },
                   'structure' => {
                     'menu_child' => {
@@ -6996,15 +6866,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsubsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3
                           }
                         },
-                        'normalized' => 'unnumbered-sub-2',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-sub-2'
                       },
                       'structure' => {
                         'node_next' => {
@@ -7012,15 +6879,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'subsection',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'numbered-sub-2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2'
                           },
                           'structure' => {
                             'node_next' => {
@@ -7028,15 +6892,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 3
                                   }
                                 },
-                                'normalized' => 'unnumbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-2'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -7044,15 +6905,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'numbered-sub2-2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub2-2'
                                   },
                                   'structure' => {
                                     'node_prev' => {},
@@ -7075,9 +6933,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 2
                           }
@@ -7085,20 +6941,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'unnumberedsec-2_002d1',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-2_002d1'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -7106,15 +6952,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'subsection',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'numbered-sub-2_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2_002d1'
                           },
                           'structure' => {
                             'node_up' => {}
@@ -7132,9 +6975,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'associated_section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'level' => 1,
                         'number' => 3
@@ -7143,20 +6984,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     'menus' => [
                       {
                         'cmdname' => 'menu',
-                        'extra' => {
-                          'end_command' => {
-                            'cmdname' => 'end',
-                            'extra' => {
-                              'command_argument' => 'menu',
-                              'spaces_before_argument' => ' ',
-                              'text_arg' => 'menu'
-                            }
-                          }
-                        }
+                        'extra' => {}
                       }
                     ],
-                    'normalized' => 'chapter-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-3'
                   },
                   'structure' => {
                     'menu_child' => {
@@ -7164,9 +6995,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumberedsec',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 2
                           }
@@ -7174,20 +7003,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'unnumberedsec-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-3'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -7195,15 +7014,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsubsec',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 3
                               }
                             },
-                            'normalized' => 'unnumbered-sub-3',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumbered-sub-3'
                           },
                           'structure' => {
                             'node_next' => {
@@ -7211,15 +7027,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'subsection',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 3
                                   }
                                 },
-                                'normalized' => 'numbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -7227,15 +7040,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'unnumberedsubsec',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'unnumbered-sub2-3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'unnumbered-sub2-3'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -7243,15 +7053,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 3
                                           }
                                         },
-                                        'normalized' => 'numbered-sub2-3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'numbered-sub2-3'
                                       },
                                       'structure' => {
                                         'node_prev' => {},
@@ -7274,16 +7081,13 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'section',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 2,
                                 'number' => '3.1'
                               }
                             },
-                            'normalized' => 'section-3_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'section-3_002d1'
                           },
                           'structure' => {
                             'node_next' => {
@@ -7291,9 +7095,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsec',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 2
                                   }
@@ -7301,20 +7103,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 'menus' => [
                                   {
                                     'cmdname' => 'menu',
-                                    'extra' => {
-                                      'end_command' => {
-                                        'cmdname' => 'end',
-                                        'extra' => {
-                                          'command_argument' => 'menu',
-                                          'spaces_before_argument' => ' ',
-                                          'text_arg' => 'menu'
-                                        }
-                                      }
-                                    }
+                                    'extra' => {}
                                   }
                                 ],
-                                'normalized' => 'unnumberedsec-3_002d2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumberedsec-3_002d2'
                               },
                               'structure' => {
                                 'menu_child' => {
@@ -7322,15 +7114,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'numbered-sub-3_002d2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-3_002d2'
                                   },
                                   'structure' => {
                                     'node_up' => {}
@@ -7341,9 +7130,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'section',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 2,
                                         'number' => '3.2'
@@ -7352,20 +7139,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     'menus' => [
                                       {
                                         'cmdname' => 'menu',
-                                        'extra' => {
-                                          'end_command' => {
-                                            'cmdname' => 'end',
-                                            'extra' => {
-                                              'command_argument' => 'menu',
-                                              'spaces_before_argument' => ' ',
-                                              'text_arg' => 'menu'
-                                            }
-                                          }
-                                        }
+                                        'extra' => {}
                                       }
                                     ],
-                                    'normalized' => 'section-3_002d3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'section-3_002d3'
                                   },
                                   'structure' => {
                                     'menu_child' => {
@@ -7373,16 +7150,13 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'subsection',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 3,
                                             'number' => '3.2.1'
                                           }
                                         },
-                                        'normalized' => 'subsection-3_002d3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'subsection-3_002d3'
                                       },
                                       'structure' => {
                                         'node_up' => {}
@@ -7393,9 +7167,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsec',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 2
                                           }
@@ -7403,20 +7175,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         'menus' => [
                                           {
                                             'cmdname' => 'menu',
-                                            'extra' => {
-                                              'end_command' => {
-                                                'cmdname' => 'end',
-                                                'extra' => {
-                                                  'command_argument' => 'menu',
-                                                  'spaces_before_argument' => 
' ',
-                                                  'text_arg' => 'menu'
-                                                }
-                                              }
-                                            }
+                                            'extra' => {}
                                           }
                                         ],
-                                        'normalized' => 
'unnumberedsec-3_002d4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumberedsec-3_002d4'
                                       },
                                       'structure' => {
                                         'menu_child' => {
@@ -7424,15 +7186,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 3
                                               }
                                             },
-                                            'normalized' => 
'numbered-sub-3_002d4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'numbered-sub-3_002d4'
                                           },
                                           'structure' => {
                                             'node_up' => {}
@@ -7462,9 +7221,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'associated_section' => {
                           'cmdname' => 'unnumbered',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 1
                           }
@@ -7472,20 +7229,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'menus' => [
                           {
                             'cmdname' => 'menu',
-                            'extra' => {
-                              'end_command' => {
-                                'cmdname' => 'end',
-                                'extra' => {
-                                  'command_argument' => 'menu',
-                                  'spaces_before_argument' => ' ',
-                                  'text_arg' => 'menu'
-                                }
-                              }
-                            }
+                            'extra' => {}
                           }
                         ],
-                        'normalized' => 'unnumbered-4',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-4'
                       },
                       'structure' => {
                         'menu_child' => {
@@ -7493,9 +7240,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'unnumberedsec',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'level' => 2
                               }
@@ -7503,20 +7248,10 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             'menus' => [
                               {
                                 'cmdname' => 'menu',
-                                'extra' => {
-                                  'end_command' => {
-                                    'cmdname' => 'end',
-                                    'extra' => {
-                                      'command_argument' => 'menu',
-                                      'spaces_before_argument' => ' ',
-                                      'text_arg' => 'menu'
-                                    }
-                                  }
-                                }
+                                'extra' => {}
                               }
                             ],
-                            'normalized' => 'unnumberedsec-4',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumberedsec-4'
                           },
                           'structure' => {
                             'menu_child' => {
@@ -7524,15 +7259,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'extra' => {
                                 'associated_section' => {
                                   'cmdname' => 'unnumberedsubsec',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'level' => 3
                                   }
                                 },
-                                'normalized' => 'unnumbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-4'
                               },
                               'structure' => {
                                 'node_next' => {
@@ -7540,15 +7272,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'extra' => {
                                     'associated_section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'level' => 3
                                       }
                                     },
-                                    'normalized' => 'numbered-sub-4',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-4'
                                   },
                                   'structure' => {
                                     'node_next' => {
@@ -7556,15 +7285,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'extra' => {
                                         'associated_section' => {
                                           'cmdname' => 'unnumberedsubsec',
-                                          'extra' => {
-                                            'spaces_before_argument' => ' '
-                                          },
+                                          'extra' => {},
                                           'structure' => {
                                             'level' => 3
                                           }
                                         },
-                                        'normalized' => 'unnumbered-sub2-4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumbered-sub2-4'
                                       },
                                       'structure' => {
                                         'node_next' => {
@@ -7572,15 +7298,12 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                           'extra' => {
                                             'associated_section' => {
                                               'cmdname' => 'subsection',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'level' => 3
                                               }
                                             },
-                                            'normalized' => 'numbered-sub2-4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'numbered-sub2-4'
                                           },
                                           'structure' => {
                                             'node_prev' => {},
@@ -7679,22 +7402,19 @@ 
$result_nodes{'section_in_unnumbered_plaintext'}{'structure'}{'node_next'} = $re
 $result_menus{'section_in_unnumbered_plaintext'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'section-in-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'section-in-chapter'
           },
           'structure' => {
             'menu_up' => {},
@@ -7706,15 +7426,13 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'unnumbered',
-            'spaces_before_argument' => ' '
+            'normalized' => 'unnumbered'
           },
           'structure' => {
             'menu_child' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'section-in-unnumbered',
-                'spaces_before_argument' => ' '
+                'normalized' => 'section-in-unnumbered'
               },
               'structure' => {
                 'menu_up' => {},
@@ -7726,43 +7444,37 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'chapter-2',
-                'spaces_before_argument' => ' '
+                'normalized' => 'chapter-2'
               },
               'structure' => {
                 'menu_child' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'unnumberedsec-2',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'unnumberedsec-2'
                   },
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumbered-sub-2',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-sub-2'
                       },
                       'structure' => {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'numbered-sub-2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub2-2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub2-2'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'numbered-sub2-2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub2-2'
                                   },
                                   'structure' => {
                                     'menu_prev' => {},
@@ -7795,15 +7507,13 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumberedsec-2_002d1',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-2_002d1'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'numbered-sub-2_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'numbered-sub-2_002d1'
                           },
                           'structure' => {
                             'menu_up' => {},
@@ -7828,43 +7538,37 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                 'menu_next' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter-3',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter-3'
                   },
                   'structure' => {
                     'menu_child' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumberedsec-3',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumberedsec-3'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'unnumbered-sub-3',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumbered-sub-3'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'numbered-sub-3',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'numbered-sub-3'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'unnumbered-sub2-3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'unnumbered-sub2-3'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'numbered-sub2-3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'numbered-sub2-3'
                                       },
                                       'structure' => {
                                         'menu_prev' => {},
@@ -7897,22 +7601,19 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'section-3_002d1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'section-3_002d1'
                           },
                           'structure' => {
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumberedsec-3_002d2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumberedsec-3_002d2'
                               },
                               'structure' => {
                                 'menu_child' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'numbered-sub-3_002d2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-3_002d2'
                                   },
                                   'structure' => {
                                     'menu_up' => {},
@@ -7924,15 +7625,13 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'section-3_002d3',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'section-3_002d3'
                                   },
                                   'structure' => {
                                     'menu_child' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'subsection-3_002d3',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'subsection-3_002d3'
                                       },
                                       'structure' => {
                                         'menu_up' => {},
@@ -7944,15 +7643,13 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 
'unnumberedsec-3_002d4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumberedsec-3_002d4'
                                       },
                                       'structure' => {
                                         'menu_child' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 
'numbered-sub-3_002d4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 
'numbered-sub-3_002d4'
                                           },
                                           'structure' => {
                                             'menu_up' => {},
@@ -7998,43 +7695,37 @@ $result_menus{'section_in_unnumbered_plaintext'} = {
                     'menu_next' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'unnumbered-4',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'unnumbered-4'
                       },
                       'structure' => {
                         'menu_child' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'unnumberedsec-4',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'unnumberedsec-4'
                           },
                           'structure' => {
                             'menu_child' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'unnumbered-sub-4',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'unnumbered-sub-4'
                               },
                               'structure' => {
                                 'menu_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => 'numbered-sub-4',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => 'numbered-sub-4'
                                   },
                                   'structure' => {
                                     'menu_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
-                                        'normalized' => 'unnumbered-sub2-4',
-                                        'spaces_before_argument' => ' '
+                                        'normalized' => 'unnumbered-sub2-4'
                                       },
                                       'structure' => {
                                         'menu_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
-                                            'normalized' => 'numbered-sub2-4',
-                                            'spaces_before_argument' => ' '
+                                            'normalized' => 'numbered-sub2-4'
                                           },
                                           'structure' => {
                                             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 95a9677c3a..8ef722cc67 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -169,11 +169,9 @@ $result_sectioning{'section_node_before_part'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 2,
@@ -183,9 +181,7 @@ $result_sectioning{'section_node_before_part'} = {
       },
       {
         'cmdname' => 'part',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_up' => {}
@@ -202,24 +198,20 @@ $result_nodes{'section_node_before_part'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'section',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 2,
         'number' => 1
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'section_node_before_part'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/sectioning_part_appendix.pl 
b/tp/t/results/sectioning/sectioning_part_appendix.pl
index 108972dd1d..d158d8a6bf 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix.pl
@@ -649,9 +649,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -664,9 +662,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                   'extra' => {
                     'section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -674,9 +670,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {
                                 'extra' => {
@@ -695,8 +689,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                             'associated_part' => {
                                               'cmdname' => 'part',
                                               'extra' => {
-                                                'part_associated_section' => 
{},
-                                                'spaces_before_argument' => ' '
+                                                'part_associated_section' => {}
                                               },
                                               'structure' => {
                                                 'associated_unit' => {},
@@ -705,9 +698,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                   {},
                                                   {
                                                     'cmdname' => 'chapter',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {
                                                         'extra' => {
@@ -722,9 +713,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                               'extra' => {
                                                                 'section' => {
                                                                   'cmdname' => 
'unnumbered',
-                                                                  'extra' => {
-                                                                    
'spaces_before_argument' => ' '
-                                                                  },
+                                                                  'extra' => 
{},
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {},
                                                                     'level' => 
1,
@@ -744,9 +733,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                     'extra' => 
{
                                                                       
'section' => {
                                                                         
'cmdname' => 'appendix',
-                                                                        
'extra' => {
-                                                                          
'spaces_before_argument' => ' '
-                                                                        },
+                                                                        
'extra' => {},
                                                                         
'structure' => {
                                                                           
'associated_unit' => {},
                                                                           
'level' => 1,
@@ -754,9 +741,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                           
'section_childs' => [
                                                                             {
                                                                               
'cmdname' => 'appendixsec',
-                                                                              
'extra' => {
-                                                                               
 'spaces_before_argument' => ' '
-                                                                              
},
+                                                                              
'extra' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {
                                                                                
   'extra' => {
@@ -835,8 +820,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                 'section_prev' => {},
                                                 'section_up' => {}
                                               }
-                                            },
-                                            'spaces_before_argument' => ' '
+                                            }
                                           },
                                           'structure' => {
                                             'associated_unit' => {},
@@ -855,18 +839,14 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                             'extra' => {
                                               'section' => {
                                                 'cmdname' => 'subsubsection',
-                                                'extra' => {
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                                'extra' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
                                                   'level' => 4,
                                                   'number' => '1.1.1.1',
                                                   'section_up' => {
                                                     'cmdname' => 'subsection',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {
                                                         'extra' => {
@@ -1119,9 +1099,7 @@ $result_elements{'sectioning_part_appendix'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -1135,9 +1113,7 @@ $result_elements{'sectioning_part_appendix'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
@@ -1157,15 +1133,12 @@ $result_elements{'sectioning_part_appendix'} = [
                     'extra' => {
                       'associated_part' => {
                         'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 0
                         }
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1181,9 +1154,7 @@ $result_elements{'sectioning_part_appendix'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'subsubsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 4,
@@ -1198,9 +1169,7 @@ $result_elements{'sectioning_part_appendix'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'subsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 3,
@@ -1215,9 +1184,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                   'extra' => {
                                     'section' => {
                                       'cmdname' => 'section',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 2,
@@ -1261,9 +1228,7 @@ $result_elements{'sectioning_part_appendix'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -1280,9 +1245,7 @@ $result_elements{'sectioning_part_appendix'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'unnumbered',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 1
@@ -1298,9 +1261,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                   'extra' => {
                                     'section' => {
                                       'cmdname' => 'appendix',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 1,
@@ -1317,9 +1278,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                         'extra' => {
                                           'section' => {
                                             'cmdname' => 'appendixsec',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
+                                            'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'level' => 2,
diff --git a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
index ab19794f9e..242cef45c5 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
@@ -591,9 +591,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -610,8 +608,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {
-                            'part_associated_section' => {},
-                            'spaces_before_argument' => ' '
+                            'part_associated_section' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -620,9 +617,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                               {},
                               {
                                 'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -637,9 +632,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                           'extra' => {
                                             'section' => {
                                               'cmdname' => 'unnumbered',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 1,
@@ -658,9 +651,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                                 'extra' => {
                                                   'section' => {
                                                     'cmdname' => 'appendix',
-                                                    'extra' => {
-                                                      'spaces_before_argument' 
=> ' '
-                                                    },
+                                                    'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
                                                       'level' => 1,
@@ -668,9 +659,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                                       'section_childs' => [
                                                         {
                                                           'cmdname' => 
'appendixsec',
-                                                          'extra' => {
-                                                            
'spaces_before_argument' => ' '
-                                                          },
+                                                          'extra' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {
                                                               'extra' => {
@@ -746,8 +735,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                             ],
                             'section_up' => {}
                           }
-                        },
-                        'spaces_before_argument' => ' '
+                        }
                       },
                       'structure' => {
                         'associated_unit' => {},
@@ -765,18 +753,14 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                         'extra' => {
                           'section' => {
                             'cmdname' => 'subsubsection',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 4,
                               'number' => '1.1.1.1',
                               'section_up' => {
                                 'cmdname' => 'subsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -789,9 +773,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                           'extra' => {
                                             'section' => {
                                               'cmdname' => 'section',
-                                              'extra' => {
-                                                'spaces_before_argument' => ' '
-                                              },
+                                              'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
                                                 'level' => 2,
@@ -1003,9 +985,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1,
@@ -1023,15 +1003,12 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
               'extra' => {
                 'associated_part' => {
                   'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'level' => 0
                   }
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'associated_unit' => {},
@@ -1047,9 +1024,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                 'extra' => {
                   'section' => {
                     'cmdname' => 'subsubsection',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 4,
@@ -1064,9 +1039,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 3,
@@ -1081,9 +1054,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'section',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 2,
@@ -1127,9 +1098,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                 'extra' => {
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -1146,9 +1115,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'unnumbered',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1
@@ -1164,9 +1131,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'appendix',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 1,
@@ -1183,9 +1148,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                   'extra' => {
                                     'section' => {
                                       'cmdname' => 'appendixsec',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 2,
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index 4f538f3f04..b7178c7277 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -63,9 +63,7 @@ $result_sectioning{'sections'} = {
     'section_childs' => [
       {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 1,
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/sectioning/sections_test.pl
index 5d311ecbd0..86a4729cd2 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -515,44 +515,34 @@ $result_sectioning{'sections_test'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => '1.1.1.1',
@@ -583,8 +573,7 @@ $result_sectioning{'sections_test'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -593,8 +582,7 @@ $result_sectioning{'sections_test'} = {
               'toplevel_prev' => {},
               'toplevel_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -602,9 +590,7 @@ $result_sectioning{'sections_test'} = {
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -616,9 +602,7 @@ $result_sectioning{'sections_test'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -634,18 +618,14 @@ $result_sectioning{'sections_test'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 'A.1',
diff --git a/tp/t/results/sectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
index e7ee8254f9..bd83d6d656 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -515,44 +515,34 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => '1.1.1.1',
@@ -583,8 +573,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -593,8 +582,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
               'toplevel_prev' => {},
               'toplevel_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -602,9 +590,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -616,9 +602,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -634,18 +618,14 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 'A.1',
diff --git 
a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
index c0e228498c..7ff3e72bc2 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -515,44 +515,34 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => '1.1.1.1',
@@ -583,8 +573,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -593,8 +582,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
               'toplevel_prev' => {},
               'toplevel_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -602,9 +590,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -616,9 +602,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -634,18 +618,14 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 'A.1',
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 24b197b7af..21ad4989e8 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -788,12 +788,10 @@ $result_sectioning{'semi_auto'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -804,12 +802,10 @@ $result_sectioning{'semi_auto'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Chap1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Chap1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -821,12 +817,10 @@ $result_sectioning{'semi_auto'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'Sec-in-chapter',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'Sec-in-chapter'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -840,12 +834,10 @@ $result_sectioning{'semi_auto'} = {
                       'associated_node' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'Section-non-auto',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'Section-non-auto'
                         },
                         'structure' => {}
-                      },
-                      'spaces_before_argument' => ' '
+                      }
                     },
                     'structure' => {
                       'level' => 2,
@@ -880,9 +872,7 @@ $result_nodes{'semi_auto'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -890,20 +880,10 @@ $result_nodes{'semi_auto'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -911,9 +891,7 @@ $result_nodes{'semi_auto'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -922,20 +900,10 @@ $result_nodes{'semi_auto'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'Chap1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap1'
       },
       'structure' => {
         'menu_child' => {
@@ -943,16 +911,13 @@ $result_nodes{'semi_auto'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'section',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => '1.1'
               }
             },
-            'normalized' => 'Sec-in-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Sec-in-chapter'
           },
           'structure' => {
             'node_next' => {
@@ -960,16 +925,13 @@ $result_nodes{'semi_auto'} = {
               'extra' => {
                 'associated_section' => {
                   'cmdname' => 'section',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'level' => 2,
                     'number' => '1.2'
                   }
                 },
-                'normalized' => 'Section-non-auto',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Section-non-auto'
               },
               'structure' => {
                 'node_prev' => {},
@@ -998,22 +960,19 @@ $result_nodes{'semi_auto'}{'structure'}{'node_next'} = 
$result_nodes{'semi_auto'
 $result_menus{'semi_auto'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chap1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Chap1'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Sec-in-chapter',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Sec-in-chapter'
           },
           'structure' => {
             'menu_up' => {},
@@ -1025,8 +984,7 @@ $result_menus{'semi_auto'} = {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Section-non-auto',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Section-non-auto'
           },
           'structure' => {
             'menu_prev' => {},
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index e4455642ef..82ffb23e16 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -185,11 +185,9 @@ $result_sectioning{'setfilename_on_top_and_after_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -206,23 +204,19 @@ $result_nodes{'setfilename_on_top_and_after_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'setfilename_on_top_and_after_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index fa74f7afb3..747be7b514 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -545,44 +545,34 @@ $result_sectioning{'shortcontents'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'level' => 2,
                       'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'level' => 3,
                             'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'level' => 4,
                                   'number' => '1.1.1.1',
@@ -613,8 +603,7 @@ $result_sectioning{'shortcontents'} = {
           'part_associated_section' => {
             'cmdname' => 'chapter',
             'extra' => {
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'level' => 1,
@@ -623,8 +612,7 @@ $result_sectioning{'shortcontents'} = {
               'toplevel_prev' => {},
               'toplevel_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -632,9 +620,7 @@ $result_sectioning{'shortcontents'} = {
             {},
             {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 3,
@@ -646,9 +632,7 @@ $result_sectioning{'shortcontents'} = {
             },
             {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'section_prev' => {},
@@ -664,18 +648,14 @@ $result_sectioning{'shortcontents'} = {
       },
       {
         'cmdname' => 'appendix',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 2,
                 'number' => 'A.1',
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index a00632d5b4..ee7268a9cb 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -562,41 +562,28 @@ $result_nodes{'space_in_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chap-first-here',
-        'spaces_before_argument' => '  '
+        'normalized' => 'Chap-first-here'
       },
       'structure' => {
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Test-title',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Test-title'
           },
           'structure' => {
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Last-with-spaces',
-                'spaces_before_argument' => '   '
+                'normalized' => 'Last-with-spaces'
               },
               'structure' => {
                 'node_prev' => {},
@@ -625,29 +612,25 @@ $result_nodes{'space_in_node'}{'structure'}{'node_next'} 
= $result_nodes{'space_
 $result_menus{'space_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Chap-first-here',
-        'spaces_before_argument' => '  '
+        'normalized' => 'Chap-first-here'
       },
       'structure' => {
         'menu_next' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Test-title',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Test-title'
           },
           'structure' => {
             'menu_next' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Last-with-spaces',
-                'spaces_before_argument' => '   '
+                'normalized' => 'Last-with-spaces'
               },
               'structure' => {
                 'menu_prev' => {},
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl 
b/tp/t/results/sectioning/top_chapter_sections.pl
index cf2ced3bf7..7dac5a788c 100644
--- a/tp/t/results/sectioning/top_chapter_sections.pl
+++ b/tp/t/results/sectioning/top_chapter_sections.pl
@@ -542,9 +542,7 @@ $result_sectioning{'top_chapter_sections'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -557,9 +555,7 @@ $result_sectioning{'top_chapter_sections'} = {
                   'extra' => {
                     'section' => {
                       'cmdname' => 'unnumbered',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -578,9 +574,7 @@ $result_sectioning{'top_chapter_sections'} = {
                         'extra' => {
                           'section' => {
                             'cmdname' => 'chapter',
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
+                            'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
                               'level' => 1,
@@ -588,9 +582,7 @@ $result_sectioning{'top_chapter_sections'} = {
                               'section_childs' => [
                                 {
                                   'cmdname' => 'section',
-                                  'extra' => {
-                                    'spaces_before_argument' => ' '
-                                  },
+                                  'extra' => {},
                                   'structure' => {
                                     'associated_unit' => {
                                       'extra' => {
@@ -605,9 +597,7 @@ $result_sectioning{'top_chapter_sections'} = {
                                             'extra' => {
                                               'section' => {
                                                 'cmdname' => 'chapter',
-                                                'extra' => {
-                                                  'spaces_before_argument' => 
' '
-                                                },
+                                                'extra' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
                                                   'level' => 1,
@@ -615,9 +605,7 @@ $result_sectioning{'top_chapter_sections'} = {
                                                   'section_childs' => [
                                                     {
                                                       'cmdname' => 'section',
-                                                      'extra' => {
-                                                        
'spaces_before_argument' => ' '
-                                                      },
+                                                      'extra' => {},
                                                       'structure' => {
                                                         'associated_unit' => {
                                                           'extra' => {
@@ -632,9 +620,7 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                 'extra' => {
                                                                   'section' => 
{
                                                                     'cmdname' 
=> 'chapter',
-                                                                    'extra' => 
{
-                                                                      
'spaces_before_argument' => ' '
-                                                                    },
+                                                                    'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
                                                                       'level' 
=> 1,
@@ -653,18 +639,14 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                       'extra' 
=> {
                                                                         
'section' => {
                                                                           
'cmdname' => 'subsection',
-                                                                          
'extra' => {
-                                                                            
'spaces_before_argument' => ' '
-                                                                          },
+                                                                          
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
                                                                             
'level' => 3,
                                                                             
'number' => '2.1.2',
                                                                             
'section_prev' => {
                                                                               
'cmdname' => 'subsection',
-                                                                              
'extra' => {
-                                                                               
 'spaces_before_argument' => ' '
-                                                                              
},
+                                                                              
'extra' => {},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {
                                                                                
   'extra' => {
@@ -956,9 +938,7 @@ $result_elements{'top_chapter_sections'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -972,9 +952,7 @@ $result_elements{'top_chapter_sections'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'unnumbered',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1
@@ -990,9 +968,7 @@ $result_elements{'top_chapter_sections'} = [
                 'extra' => {
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -1009,9 +985,7 @@ $result_elements{'top_chapter_sections'} = [
                       'extra' => {
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -1026,9 +1000,7 @@ $result_elements{'top_chapter_sections'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'section',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 2,
@@ -1054,9 +1026,7 @@ $result_elements{'top_chapter_sections'} = [
                             'extra' => {
                               'section' => {
                                 'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 1,
@@ -1071,9 +1041,7 @@ $result_elements{'top_chapter_sections'} = [
                                   'extra' => {
                                     'section' => {
                                       'cmdname' => 'subsection',
-                                      'extra' => {
-                                        'spaces_before_argument' => ' '
-                                      },
+                                      'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
                                         'level' => 3,
@@ -1088,9 +1056,7 @@ $result_elements{'top_chapter_sections'} = [
                                         'extra' => {
                                           'section' => {
                                             'cmdname' => 'subsection',
-                                            'extra' => {
-                                              'spaces_before_argument' => ' '
-                                            },
+                                            'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
                                               'level' => 3,
@@ -1105,9 +1071,7 @@ $result_elements{'top_chapter_sections'} = [
                                               'extra' => {
                                                 'section' => {
                                                   'cmdname' => 'section',
-                                                  'extra' => {
-                                                    'spaces_before_argument' 
=> ' '
-                                                  },
+                                                  'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
                                                     'level' => 2,
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index 632f0f89ea..4da5065a2c 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -104,8 +104,7 @@ $result_sectioning{'top_no_argument_and_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'start',
-              'spaces_before_argument' => ' '
+              'normalized' => 'start'
             }
           }
         },
@@ -129,16 +128,14 @@ $result_nodes{'top_no_argument_and_node'} = {
         'level' => 0
       }
     },
-    'normalized' => 'start',
-    'spaces_before_argument' => ' '
+    'normalized' => 'start'
   }
 };
 
 $result_menus{'top_no_argument_and_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'start',
-    'spaces_before_argument' => ' '
+    'normalized' => 'start'
   }
 };
 
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index 7283f48e10..3e1008f37b 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -104,8 +104,7 @@ $result_sectioning{'top_no_argument_and_top_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
           }
         },
@@ -129,16 +128,14 @@ $result_nodes{'top_no_argument_and_top_node'} = {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'top_no_argument_and_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 40528a9d57..45ff30a330 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -386,27 +386,16 @@ $result_nodes{'top_node_no_menu_direction'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'node_prev' => {},
@@ -423,15 +412,13 @@ 
$result_nodes{'top_node_no_menu_direction'}{'structure'}{'node_next'} = $result_
 $result_menus{'top_node_no_menu_direction'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'second-node',
-        'spaces_before_argument' => ' '
+        'normalized' => 'second-node'
       },
       'structure' => {
         'menu_next' => {},
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index ffacc2873b..1eeb32e218 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -195,8 +195,7 @@ $result_sectioning{'top_node_part_top'} = {
               'associated_node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'Top',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'Top'
                 },
                 'structure' => {
                   'associated_unit' => {
@@ -214,8 +213,7 @@ $result_sectioning{'top_node_part_top'} = {
                   }
                 }
               },
-              'associated_part' => {},
-              'spaces_before_argument' => ' '
+              'associated_part' => {}
             },
             'structure' => {
               'associated_unit' => {},
@@ -223,8 +221,7 @@ $result_sectioning{'top_node_part_top'} = {
               'section_prev' => {},
               'section_up' => {}
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -256,9 +253,7 @@ $result_nodes{'top_node_part_top'} = {
       'extra' => {
         'associated_part' => {
           'cmdname' => 'part',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {
               'extra' => {
@@ -275,16 +270,14 @@ $result_nodes{'top_node_part_top'} = {
             },
             'level' => 0
           }
-        },
-        'spaces_before_argument' => ' '
+        }
       },
       'structure' => {
         'associated_unit' => {},
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {}
@@ -300,8 +293,7 @@ 
$result_nodes{'top_node_part_top'}{'structure'}{'associated_unit'} = $result_nod
 $result_menus{'top_node_part_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -312,15 +304,12 @@ $result_menus{'top_node_part_top'} = {
           'extra' => {
             'associated_part' => {
               'cmdname' => 'part',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 0
               }
-            },
-            'spaces_before_argument' => ' '
+            }
           },
           'structure' => {
             'associated_unit' => {},
@@ -375,8 +364,7 @@ $result_elements{'top_node_part_top'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {}
@@ -387,15 +375,12 @@ $result_elements{'top_node_part_top'} = [
         'extra' => {
           'associated_part' => {
             'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
+            'extra' => {},
             'structure' => {
               'associated_unit' => {},
               'level' => 0
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index b28057f05e..e0a6f10c25 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -343,8 +343,7 @@ $result_sectioning{'top_node_up_url'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -360,8 +359,7 @@ $result_sectioning{'top_node_up_url'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'first',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'first'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -391,8 +389,7 @@ $result_sectioning{'top_node_up_url'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -427,9 +424,7 @@ $result_nodes{'top_node_up_url'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -444,8 +439,7 @@ $result_nodes{'top_node_up_url'} = {
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'first',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'first'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -482,20 +476,10 @@ $result_nodes{'top_node_up_url'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -528,8 +512,7 @@ $result_nodes{'top_node_up_url'}{'structure'}{'node_next'} 
= $result_nodes{'top_
 $result_menus{'top_node_up_url'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -537,9 +520,7 @@ $result_menus{'top_node_up_url'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -554,8 +535,7 @@ $result_menus{'top_node_up_url'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'first',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'first'
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -622,16 +602,14 @@ $result_elements{'top_node_up_url'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'first',
-              'spaces_before_argument' => ' '
+              'normalized' => 'first'
             },
             'structure' => {
               'associated_unit' => {
@@ -661,9 +639,7 @@ $result_elements{'top_node_up_url'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 016c1e8b06..79184f56b1 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -185,9 +185,7 @@ $result_sectioning{'top_part_chapter'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -204,8 +202,7 @@ $result_sectioning{'top_part_chapter'} = {
                         'associated_part' => {
                           'cmdname' => 'part',
                           'extra' => {
-                            'part_associated_section' => {},
-                            'spaces_before_argument' => ' '
+                            'part_associated_section' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -216,8 +213,7 @@ $result_sectioning{'top_part_chapter'} = {
                             'section_prev' => {},
                             'section_up' => {}
                           }
-                        },
-                        'spaces_before_argument' => ' '
+                        }
                       },
                       'structure' => {
                         'associated_unit' => {},
@@ -290,9 +286,7 @@ $result_elements{'top_part_chapter'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -309,15 +303,12 @@ $result_elements{'top_part_chapter'} = [
               'extra' => {
                 'associated_part' => {
                   'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
+                  'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
                     'level' => 0
                   }
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'associated_unit' => {},
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index ade7f12081..7ffbe4eddc 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -258,17 +258,14 @@ $result_sectioning{'top_without_node_nodes'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second'
                 },
                 'structure' => {
                   'associated_unit' => {}
@@ -277,8 +274,7 @@ $result_sectioning{'top_without_node_nodes'} = {
               'section' => {
                 'cmdname' => 'chapter',
                 'extra' => {
-                  'associated_node' => {},
-                  'spaces_before_argument' => ' '
+                  'associated_node' => {}
                 },
                 'structure' => {
                   'associated_unit' => {},
@@ -294,13 +290,7 @@ $result_sectioning{'top_without_node_nodes'} = {
             'structure' => {
               'directions' => {
                 'NodeUp' => {
-                  'extra' => {
-                    'manual_content' => [
-                      {
-                        'text' => 'dir'
-                      }
-                    ]
-                  },
+                  'extra' => {},
                   'type' => 'external_node'
                 },
                 'This' => {}
@@ -334,9 +324,7 @@ $result_nodes{'top_without_node_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -365,8 +353,7 @@ $result_nodes{'top_without_node_nodes'} = {
         'number' => 1
       }
     },
-    'normalized' => 'second',
-    'spaces_before_argument' => ' '
+    'normalized' => 'second'
   },
   'structure' => {
     'associated_unit' => {},
@@ -388,8 +375,7 @@ 
$result_nodes{'top_without_node_nodes'}{'structure'}{'node_up'}{'extra'}{'manual
 $result_menus{'top_without_node_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'second',
-    'spaces_before_argument' => ' '
+    'normalized' => 'second'
   },
   'structure' => {
     'associated_unit' => {
@@ -397,9 +383,7 @@ $result_menus{'top_without_node_nodes'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1,
@@ -444,8 +428,7 @@ $result_elements{'top_without_node_nodes'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'second',
-          'spaces_before_argument' => ' '
+          'normalized' => 'second'
         },
         'structure' => {
           'associated_unit' => {}
@@ -453,9 +436,7 @@ $result_elements{'top_without_node_nodes'} = [
       },
       'section' => {
         'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1,
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index fc7fe3c35d..ef3040d9ae 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -269,9 +269,7 @@ $result_sectioning{'top_without_node_sections'} = {
     'section_childs' => [
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -285,8 +283,7 @@ $result_sectioning{'top_without_node_sections'} = {
                     'node' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'second',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'second'
                       },
                       'structure' => {
                         'associated_unit' => {}
@@ -295,8 +292,7 @@ $result_sectioning{'top_without_node_sections'} = {
                     'section' => {
                       'cmdname' => 'chapter',
                       'extra' => {
-                        'associated_node' => {},
-                        'spaces_before_argument' => ' '
+                        'associated_node' => {}
                       },
                       'structure' => {
                         'associated_unit' => {},
@@ -314,13 +310,7 @@ $result_sectioning{'top_without_node_sections'} = {
                       'Back' => {},
                       'FastBack' => {},
                       'NodeUp' => {
-                        'extra' => {
-                          'manual_content' => [
-                            {
-                              'text' => 'dir'
-                            }
-                          ]
-                        },
+                        'extra' => {},
                         'type' => 'external_node'
                       },
                       'This' => {},
@@ -372,9 +362,7 @@ $result_nodes{'top_without_node_sections'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'chapter',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -388,9 +376,7 @@ $result_nodes{'top_without_node_sections'} = {
                 'extra' => {
                   'section' => {
                     'cmdname' => 'top',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 0
@@ -430,8 +416,7 @@ $result_nodes{'top_without_node_sections'} = {
         'number' => 1
       }
     },
-    'normalized' => 'second',
-    'spaces_before_argument' => ' '
+    'normalized' => 'second'
   },
   'structure' => {
     'associated_unit' => {},
@@ -462,8 +447,7 @@ 
$result_nodes{'top_without_node_sections'}{'structure'}{'node_up'}{'extra'}{'man
 $result_menus{'top_without_node_sections'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'second',
-    'spaces_before_argument' => ' '
+    'normalized' => 'second'
   },
   'structure' => {
     'associated_unit' => {
@@ -471,9 +455,7 @@ $result_menus{'top_without_node_sections'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1,
@@ -488,9 +470,7 @@ $result_menus{'top_without_node_sections'} = {
             'extra' => {
               'section' => {
                 'cmdname' => 'top',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 0
@@ -553,9 +533,7 @@ $result_elements{'top_without_node_sections'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
@@ -570,8 +548,7 @@ $result_elements{'top_without_node_sections'} = [
             'node' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'second',
-                'spaces_before_argument' => ' '
+                'normalized' => 'second'
               },
               'structure' => {
                 'associated_unit' => {}
@@ -579,9 +556,7 @@ $result_elements{'top_without_node_sections'} = [
             },
             'section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 44705785ef..0cfba21eef 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -658,20 +658,10 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -686,16 +676,14 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => '_00e3',
-                  'spaces_before_argument' => ' '
+                  'normalized' => '_00e3'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'node_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'n',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'n'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -711,8 +699,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
                                 'node' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_00e2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_00e2'
                                   },
                                   'structure' => {
                                     'associated_unit' => {},
@@ -835,8 +822,7 @@ 
$result_nodes{'transliterated_split_equivalent_nodes'}{'structure'}{'node_next'}
 $result_menus{'transliterated_split_equivalent_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -851,16 +837,14 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => '_00e3',
-                  'spaces_before_argument' => ' '
+                  'normalized' => '_00e3'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'n',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'n'
                     },
                     'structure' => {
                       'associated_unit' => {
@@ -876,8 +860,7 @@ $result_menus{'transliterated_split_equivalent_nodes'} = {
                                 'node' => {
                                   'cmdname' => 'node',
                                   'extra' => {
-                                    'normalized' => '_00e2',
-                                    'spaces_before_argument' => ' '
+                                    'normalized' => '_00e2'
                                   },
                                   'structure' => {
                                     'associated_unit' => {},
@@ -1014,16 +997,14 @@ 
$result_elements{'transliterated_split_equivalent_nodes'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => '_00e3',
-              'spaces_before_argument' => ' '
+              'normalized' => '_00e3'
             },
             'structure' => {
               'associated_unit' => {
@@ -1039,16 +1020,14 @@ 
$result_elements{'transliterated_split_equivalent_nodes'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'n',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'n'
                           },
                           'structure' => {
                             'associated_unit' => {},
                             'menu_next' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => '_00e2',
-                                'spaces_before_argument' => ' '
+                                'normalized' => '_00e2'
                               },
                               'structure' => {
                                 'associated_unit' => {
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 b6a62596d2..e23e1af7e2 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -726,8 +726,7 @@ $result_sectioning{'two_nodes_at_the_end'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -743,8 +742,7 @@ $result_sectioning{'two_nodes_at_the_end'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-1'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -753,8 +751,7 @@ $result_sectioning{'two_nodes_at_the_end'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -793,8 +790,7 @@ $result_sectioning{'two_nodes_at_the_end'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -842,9 +838,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -861,33 +855,28 @@ $result_nodes{'two_nodes_at_the_end'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-1',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-1'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'node_next' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'node-after-chapter-1',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'node-after-chapter-1'
                         },
                         'structure' => {
                           'associated_unit' => {},
                           'node_next' => {
                             'cmdname' => 'node',
                             'extra' => {
-                              'normalized' => 'node-after-chapter-2',
-                              'spaces_before_argument' => ' '
+                              'normalized' => 'node-after-chapter-2'
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -937,20 +926,10 @@ $result_nodes{'two_nodes_at_the_end'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -995,8 +974,7 @@ 
$result_nodes{'two_nodes_at_the_end'}{'structure'}{'node_next'} = $result_nodes{
 $result_menus{'two_nodes_at_the_end'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1004,9 +982,7 @@ $result_menus{'two_nodes_at_the_end'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1021,24 +997,21 @@ $result_menus{'two_nodes_at_the_end'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-1',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-1'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'node-after-chapter-1',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'node-after-chapter-1'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'menu_next' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'node-after-chapter-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'node-after-chapter-2'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -1064,9 +1037,7 @@ $result_menus{'two_nodes_at_the_end'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -1145,16 +1116,14 @@ $result_elements{'two_nodes_at_the_end'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-1',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-1'
             },
             'structure' => {
               'associated_unit' => {
@@ -1162,9 +1131,7 @@ $result_elements{'two_nodes_at_the_end'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -1191,16 +1158,14 @@ $result_elements{'two_nodes_at_the_end'} = [
               'menu_next' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'node-after-chapter-1',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'node-after-chapter-1'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'node-after-chapter-2',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'node-after-chapter-2'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -1228,9 +1193,7 @@ $result_elements{'two_nodes_at_the_end'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 8994192fb2..5a59bf9901 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -752,8 +752,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {
               'associated_unit' => {
@@ -769,8 +768,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-1',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-1'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -779,8 +777,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -802,8 +799,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'chapter-2',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'chapter-2'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -812,8 +808,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                               'section' => {
                                 'cmdname' => 'chapter',
                                 'extra' => {
-                                  'associated_node' => {},
-                                  'spaces_before_argument' => ' '
+                                  'associated_node' => {}
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -867,8 +862,7 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -938,9 +932,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -957,17 +949,14 @@ $result_nodes{'two_nodes_between_chapters'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
                           'number' => 1
                         }
                       },
-                      'normalized' => 'chapter-1',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'chapter-1'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -975,8 +964,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
                       'node_prev' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'node-between-chapters',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'node-between-chapters'
                         },
                         'structure' => {
                           'associated_unit' => {},
@@ -985,9 +973,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
                             'extra' => {
                               'associated_section' => {
                                 'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {
                                     'extra' => {
@@ -1013,8 +999,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
                                   'number' => 2
                                 }
                               },
-                              'normalized' => 'chapter-2',
-                              'spaces_before_argument' => ' '
+                              'normalized' => 'chapter-2'
                             },
                             'structure' => {
                               'associated_unit' => {},
@@ -1068,20 +1053,10 @@ $result_nodes{'two_nodes_between_chapters'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {},
@@ -1142,8 +1117,7 @@ 
$result_nodes{'two_nodes_between_chapters'}{'structure'}{'node_next'} = $result_
 $result_menus{'two_nodes_between_chapters'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -1151,9 +1125,7 @@ $result_menus{'two_nodes_between_chapters'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 0
@@ -1168,24 +1140,21 @@ $result_menus{'two_nodes_between_chapters'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'chapter-1',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'chapter-1'
                 },
                 'structure' => {
                   'associated_unit' => {},
                   'menu_next' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'node-between-chapters',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'node-between-chapters'
                     },
                     'structure' => {
                       'associated_unit' => {},
                       'menu_next' => {
                         'cmdname' => 'node',
                         'extra' => {
-                          'normalized' => 'chapter-2',
-                          'spaces_before_argument' => ' '
+                          'normalized' => 'chapter-2'
                         },
                         'structure' => {
                           'associated_unit' => {
@@ -1193,9 +1162,7 @@ $result_menus{'two_nodes_between_chapters'} = {
                               'node' => {},
                               'section' => {
                                 'cmdname' => 'chapter',
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
+                                'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
                                   'level' => 1,
@@ -1240,9 +1207,7 @@ $result_menus{'two_nodes_between_chapters'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -1360,16 +1325,14 @@ $result_elements{'two_nodes_between_chapters'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
+          'normalized' => 'Top'
         },
         'structure' => {
           'associated_unit' => {},
           'menu_child' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'chapter-1',
-              'spaces_before_argument' => ' '
+              'normalized' => 'chapter-1'
             },
             'structure' => {
               'associated_unit' => {
@@ -1377,9 +1340,7 @@ $result_elements{'two_nodes_between_chapters'} = [
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
@@ -1397,16 +1358,14 @@ $result_elements{'two_nodes_between_chapters'} = [
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'chapter-2',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'chapter-2'
                           },
                           'structure' => {
                             'associated_unit' => {},
                             'menu_prev' => {
                               'cmdname' => 'node',
                               'extra' => {
-                                'normalized' => 'node-between-chapters',
-                                'spaces_before_argument' => ' '
+                                'normalized' => 'node-between-chapters'
                               },
                               'structure' => {
                                 'associated_unit' => {},
@@ -1426,9 +1385,7 @@ $result_elements{'two_nodes_between_chapters'} = [
                         },
                         'section' => {
                           'cmdname' => 'chapter',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -1474,9 +1431,7 @@ $result_elements{'two_nodes_between_chapters'} = [
       },
       'section' => {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 0
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index b26245aa83..67ec5b85a5 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -216,20 +216,10 @@ $result_nodes{'unknown_node_in_menu'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -237,8 +227,7 @@ $result_nodes{'unknown_node_in_menu'} = {
 $result_menus{'unknown_node_in_menu'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index 3f269e60ea..8917d8c1ec 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -227,9 +227,7 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -243,8 +241,7 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
                     'node' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'Top',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'Top'
                       },
                       'structure' => {
                         'associated_unit' => {}
@@ -253,8 +250,7 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
                     'section' => {
                       'cmdname' => 'top',
                       'extra' => {
-                        'associated_node' => {},
-                        'spaces_before_argument' => ' '
+                        'associated_node' => {}
                       },
                       'structure' => {
                         'associated_unit' => {},
@@ -319,9 +315,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -335,9 +329,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
                 'extra' => {
                   'section' => {
                     'cmdname' => 'unnumbered',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1
@@ -367,8 +359,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
         'level' => 1
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {}
@@ -393,8 +384,7 @@ 
$result_nodes{'unnumbered_before_node_top_top'}{'structure'}{'associated_unit'}
 $result_menus{'unnumbered_before_node_top_top'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -402,9 +392,7 @@ $result_menus{'unnumbered_before_node_top_top'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'top',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1
@@ -418,9 +406,7 @@ $result_menus{'unnumbered_before_node_top_top'} = {
             'extra' => {
               'section' => {
                 'cmdname' => 'unnumbered',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1
@@ -485,9 +471,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1
@@ -502,8 +486,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
             'node' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'Top',
-                'spaces_before_argument' => ' '
+                'normalized' => 'Top'
               },
               'structure' => {
                 'associated_unit' => {}
@@ -511,9 +494,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
             },
             'section' => {
               'cmdname' => 'top',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1
diff --git a/tp/t/results/sectioning/unnumbered_before_top.pl 
b/tp/t/results/sectioning/unnumbered_before_top.pl
index ed42c91afe..3ed70fe822 100644
--- a/tp/t/results/sectioning/unnumbered_before_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top.pl
@@ -108,9 +108,7 @@ $result_sectioning{'unnumbered_before_top'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_up' => {}
@@ -118,9 +116,7 @@ $result_sectioning{'unnumbered_before_top'} = {
       },
       {
         'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'level' => 1,
           'section_prev' => {},
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 4bc0c897f0..51b0e3e7b8 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -195,9 +195,7 @@ $result_sectioning{'unnumbered_before_top_node'} = {
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {
             'extra' => {
@@ -226,17 +224,14 @@ 
$result_sectioning{'unnumbered_before_top_node'}{'structure'}{'section_childs'}[
 $result_nodes{'unnumbered_before_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1
@@ -260,17 +255,14 @@ 
$result_nodes{'unnumbered_before_top_node'}{'structure'}{'associated_unit'}{'str
 $result_menus{'unnumbered_before_top_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
       'extra' => {
         'section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1
@@ -302,9 +294,7 @@ $result_elements{'unnumbered_before_top_node'} = [
     'extra' => {
       'section' => {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index 673ec866f4..33cfa17014 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -437,8 +437,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'a-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'a-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -456,8 +455,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                         'node' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 'second',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'second'
                           },
                           'structure' => {
                             'associated_unit' => {}
@@ -466,8 +464,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                         'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
-                            'associated_node' => {},
-                            'spaces_before_argument' => ' '
+                            'associated_node' => {}
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -475,9 +472,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                             'number' => 1,
                             'section_prev' => {
                               'cmdname' => 'top',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 1,
@@ -497,13 +492,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                         'directions' => {
                           'Back' => {},
                           'NodeUp' => {
-                            'extra' => {
-                              'manual_content' => [
-                                {
-                                  'text' => 'dir'
-                                }
-                              ]
-                            },
+                            'extra' => {},
                             'type' => 'external_node'
                           },
                           'Prev' => {},
@@ -514,13 +503,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                       'type' => 'unit'
                     },
                     'NodeUp' => {
-                      'extra' => {
-                        'manual_content' => [
-                          {
-                            'text' => 'dir'
-                          }
-                        ]
-                      },
+                      'extra' => {},
                       'type' => 'external_node'
                     },
                     'This' => {}
@@ -530,8 +513,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -576,9 +558,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'unnumbered',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -597,17 +577,14 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
                     'extra' => {
                       'associated_section' => {
                         'cmdname' => 'chapter',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
+                        'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
                           'level' => 1,
                           'number' => 1
                         }
                       },
-                      'normalized' => 'second',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'second'
                     },
                     'structure' => {
                       'associated_unit' => {},
@@ -661,8 +638,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
         'level' => 1
       }
     },
-    'normalized' => 'a-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a-node'
   },
   'structure' => {
     'associated_unit' => {},
@@ -696,8 +672,7 @@ 
$result_nodes{'unnumbered_top_without_node_nodes'}{'structure'}{'node_up'}{'extr
 $result_menus{'unnumbered_top_without_node_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a-node'
   },
   'structure' => {
     'associated_unit' => {
@@ -705,9 +680,7 @@ $result_menus{'unnumbered_top_without_node_nodes'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1
@@ -724,8 +697,7 @@ $result_menus{'unnumbered_top_without_node_nodes'} = {
               'node' => {
                 'cmdname' => 'node',
                 'extra' => {
-                  'normalized' => 'second',
-                  'spaces_before_argument' => ' '
+                  'normalized' => 'second'
                 },
                 'structure' => {
                   'associated_unit' => {}
@@ -733,9 +705,7 @@ $result_menus{'unnumbered_top_without_node_nodes'} = {
               },
               'section' => {
                 'cmdname' => 'chapter',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1,
@@ -828,8 +798,7 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
+          'normalized' => 'a-node'
         },
         'structure' => {
           'associated_unit' => {}
@@ -837,9 +806,7 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
       },
       'section' => {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1
@@ -856,8 +823,7 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
             'node' => {
               'cmdname' => 'node',
               'extra' => {
-                'normalized' => 'second',
-                'spaces_before_argument' => ' '
+                'normalized' => 'second'
               },
               'structure' => {
                 'associated_unit' => {}
@@ -865,9 +831,7 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
             },
             'section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1,
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 7c333c62fc..52606e60b3 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -448,8 +448,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'a-node',
-              'spaces_before_argument' => ' '
+              'normalized' => 'a-node'
             },
             'structure' => {
               'associated_unit' => {
@@ -464,9 +463,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                       'extra' => {
                         'section' => {
                           'cmdname' => 'top',
-                          'extra' => {
-                            'spaces_before_argument' => ' '
-                          },
+                          'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
                             'level' => 1,
@@ -486,8 +483,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                               'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
-                                  'normalized' => 'second',
-                                  'spaces_before_argument' => ' '
+                                  'normalized' => 'second'
                                 },
                                 'structure' => {
                                   'associated_unit' => {}
@@ -496,8 +492,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                               'section' => {
                                 'cmdname' => 'chapter',
                                 'extra' => {
-                                  'associated_node' => {},
-                                  'spaces_before_argument' => ' '
+                                  'associated_node' => {}
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
@@ -516,13 +511,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                                 'Back' => {},
                                 'FastBack' => {},
                                 'NodeUp' => {
-                                  'extra' => {
-                                    'manual_content' => [
-                                      {
-                                        'text' => 'dir'
-                                      }
-                                    ]
-                                  },
+                                  'extra' => {},
                                   'type' => 'external_node'
                                 },
                                 'Prev' => {},
@@ -545,13 +534,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                     'Forward' => {},
                     'Next' => {},
                     'NodeUp' => {
-                      'extra' => {
-                        'manual_content' => [
-                          {
-                            'text' => 'dir'
-                          }
-                        ]
-                      },
+                      'extra' => {},
                       'type' => 'external_node'
                     },
                     'This' => {}
@@ -561,8 +544,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                 'type' => 'unit'
               }
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'associated_unit' => {},
@@ -618,9 +600,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'unnumbered',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'associated_unit' => {
           'extra' => {
@@ -634,9 +614,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
                 'extra' => {
                   'section' => {
                     'cmdname' => 'top',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1
@@ -655,17 +633,14 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
                           'extra' => {
                             'associated_section' => {
                               'cmdname' => 'chapter',
-                              'extra' => {
-                                'spaces_before_argument' => ' '
-                              },
+                              'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
                                 'level' => 1,
                                 'number' => 1
                               }
                             },
-                            'normalized' => 'second',
-                            'spaces_before_argument' => ' '
+                            'normalized' => 'second'
                           },
                           'structure' => {
                             'associated_unit' => {},
@@ -732,8 +707,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
         'level' => 1
       }
     },
-    'normalized' => 'a-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a-node'
   },
   'structure' => {
     'associated_unit' => {},
@@ -778,8 +752,7 @@ 
$result_nodes{'unnumbered_top_without_node_sections'}{'structure'}{'node_up'}{'e
 $result_menus{'unnumbered_top_without_node_sections'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a-node',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a-node'
   },
   'structure' => {
     'associated_unit' => {
@@ -787,9 +760,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
         'node' => {},
         'section' => {
           'cmdname' => 'unnumbered',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'associated_unit' => {},
             'level' => 1
@@ -803,9 +774,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
             'extra' => {
               'section' => {
                 'cmdname' => 'top',
-                'extra' => {
-                  'spaces_before_argument' => ' '
-                },
+                'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
                   'level' => 1
@@ -822,8 +791,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
                     'node' => {
                       'cmdname' => 'node',
                       'extra' => {
-                        'normalized' => 'second',
-                        'spaces_before_argument' => ' '
+                        'normalized' => 'second'
                       },
                       'structure' => {
                         'associated_unit' => {}
@@ -831,9 +799,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
                     },
                     'section' => {
                       'cmdname' => 'chapter',
-                      'extra' => {
-                        'spaces_before_argument' => ' '
-                      },
+                      'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
                         'level' => 1,
@@ -950,8 +916,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
       'node' => {
         'cmdname' => 'node',
         'extra' => {
-          'normalized' => 'a-node',
-          'spaces_before_argument' => ' '
+          'normalized' => 'a-node'
         },
         'structure' => {
           'associated_unit' => {}
@@ -959,9 +924,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
       },
       'section' => {
         'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
+        'extra' => {},
         'structure' => {
           'associated_unit' => {},
           'level' => 1
@@ -975,9 +938,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
           'extra' => {
             'section' => {
               'cmdname' => 'top',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'associated_unit' => {},
                 'level' => 1
@@ -994,8 +955,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
-                      'normalized' => 'second',
-                      'spaces_before_argument' => ' '
+                      'normalized' => 'second'
                     },
                     'structure' => {
                       'associated_unit' => {}
@@ -1003,9 +963,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = 
[
                   },
                   'section' => {
                     'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
+                    'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
                       'level' => 1,
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index ca0f0478c2..a69f69cc3e 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -955,8 +955,7 @@ $result_nodes{'value_in_index_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -965,8 +964,7 @@ $result_menus{'value_in_index_commands'} = {
   'cmdname' => 'node',
   'extra' => {
     'isindex' => 1,
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 3577e47705..768ffbec24 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -3346,12 +3346,10 @@ $result_sectioning{'value_in_misc_commands'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3368,15 +3366,12 @@ $result_nodes{'value_in_misc_commands'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
@@ -3384,8 +3379,7 @@ $result_nodes{'value_in_misc_commands'} = {
 $result_menus{'value_in_misc_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 7f2edcf614..3dab2128e3 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -879,12 +879,10 @@ $result_sectioning{'value_in_node'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -895,12 +893,10 @@ $result_sectioning{'value_in_node'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'Node-1',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'Node-1'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -927,9 +923,7 @@ $result_nodes{'value_in_node'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -937,20 +931,10 @@ $result_nodes{'value_in_node'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -958,9 +942,7 @@ $result_nodes{'value_in_node'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
@@ -969,27 +951,16 @@ $result_nodes{'value_in_node'} = {
         'menus' => [
           {
             'cmdname' => 'menu',
-            'extra' => {
-              'end_command' => {
-                'cmdname' => 'end',
-                'extra' => {
-                  'command_argument' => 'menu',
-                  'spaces_before_argument' => ' ',
-                  'text_arg' => 'menu'
-                }
-              }
-            }
+            'extra' => {}
           }
         ],
-        'normalized' => 'Node-1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Node-1'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Section-1_002e1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Section-1_002e1'
           },
           'structure' => {
             'node_prev' => {},
@@ -1037,22 +1008,19 @@ 
$result_nodes{'value_in_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'
 $result_menus{'value_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'Node-1',
-        'spaces_before_argument' => ' '
+        'normalized' => 'Node-1'
       },
       'structure' => {
         'menu_child' => {
           'cmdname' => 'node',
           'extra' => {
-            'normalized' => 'Section-1_002e1',
-            'spaces_before_argument' => ' '
+            'normalized' => 'Section-1_002e1'
           },
           'structure' => {
             'menu_up' => {},
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index 234bc26fb8..121d3cae27 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -567,12 +567,10 @@ $result_sectioning{'value_node_directions'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -583,12 +581,10 @@ $result_sectioning{'value_node_directions'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'bar',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'bar'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -604,12 +600,10 @@ $result_sectioning{'value_node_directions'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'BarFoo',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'BarFoo'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -641,15 +635,12 @@ $result_nodes{'value_node_directions'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -657,16 +648,13 @@ $result_nodes{'value_node_directions'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'bar',
-        'spaces_before_argument' => ' '
+        'normalized' => 'bar'
       },
       'structure' => {
         'node_next' => {
@@ -674,16 +662,13 @@ $result_nodes{'value_node_directions'} = {
           'extra' => {
             'associated_section' => {
               'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
+              'extra' => {},
               'structure' => {
                 'level' => 1,
                 'number' => 2
               }
             },
-            'normalized' => 'BarFoo',
-            'spaces_before_argument' => ' '
+            'normalized' => 'BarFoo'
           },
           'structure' => {
             'node_prev' => {},
@@ -736,8 +721,7 @@ 
$result_nodes{'value_node_directions'}{'structure'}{'node_next'}{'structure'}{'n
 $result_menus{'value_node_directions'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 72d4fe9d1a..dd06cbf1fc 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -2203,8 +2203,7 @@ T
 $result_nodes{'commands_and_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a'
   },
   'structure' => {
     'node_next' => {
@@ -2240,8 +2239,7 @@ $result_nodes{'commands_and_spaces'} = {
 $result_menus{'commands_and_spaces'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'a',
-    'spaces_before_argument' => ' '
+    'normalized' => 'a'
   },
   'structure' => {}
 };
@@ -2267,16 +2265,7 @@ $result_floats{'commands_and_spaces'} = {
         'caption' => {
           'cmdname' => 'caption',
           'extra' => {
-            'float' => {},
-            'spaces_before_argument' => ' '
-          }
-        },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
+            'float' => {}
           }
         },
         'normalized' => 'b',
@@ -2286,7 +2275,6 @@ $result_floats{'commands_and_spaces'} = {
             'float' => {}
           }
         },
-        'spaces_before_argument' => '  ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index f77a202ff7..81bdc5f8ae 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -1265,16 +1265,7 @@ $result_floats{'comments_end_lines'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'g',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
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 eaaf45798b..bad10d3e4c 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
@@ -2748,16 +2748,7 @@ $result_floats{'comments_on_block_command_lines'} = {
     {
       'cmdname' => 'float',
       'extra' => {
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'normalized' => 'g',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
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 5fc4570fa1..ef2e09609e 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -1960,12 +1960,10 @@ $result_sectioning{'image_inline_or_not'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1976,12 +1974,10 @@ $result_sectioning{'image_inline_or_not'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'node_005fimage',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'node_005fimage'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -2008,9 +2004,7 @@ $result_nodes{'image_inline_or_not'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
@@ -2018,20 +2012,10 @@ $result_nodes{'image_inline_or_not'} = {
     'menus' => [
       {
         'cmdname' => 'menu',
-        'extra' => {
-          'end_command' => {
-            'cmdname' => 'end',
-            'extra' => {
-              'command_argument' => 'menu',
-              'spaces_before_argument' => ' ',
-              'text_arg' => 'menu'
-            }
-          }
-        }
+        'extra' => {}
       }
     ],
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
@@ -2039,16 +2023,13 @@ $result_nodes{'image_inline_or_not'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'node_005fimage',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node_005fimage'
       },
       'structure' => {
         'node_prev' => {},
@@ -2065,15 +2046,13 @@ 
$result_nodes{'image_inline_or_not'}{'structure'}{'node_next'} = $result_nodes{'
 $result_menus{'image_inline_or_not'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'normalized' => 'node_005fimage',
-        'spaces_before_argument' => ' '
+        'normalized' => 'node_005fimage'
       },
       'structure' => {
         'menu_next' => {
@@ -2110,26 +2089,15 @@ $result_floats{'image_inline_or_not'} = {
             'float' => {}
           }
         },
-        'end_command' => {
-          'cmdname' => 'end',
-          'extra' => {
-            'command_argument' => 'float',
-            'spaces_before_argument' => ' ',
-            'text_arg' => 'float'
-          }
-        },
         'float_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
         'normalized' => 'g',
-        'spaces_before_argument' => ' ',
         'type' => {
           'content' => [
             {
diff --git a/tp/t/results/xml_tests/node_and_bye.pl 
b/tp/t/results/xml_tests/node_and_bye.pl
index 3faa7780c0..2b6393f6ce 100644
--- a/tp/t/results/xml_tests/node_and_bye.pl
+++ b/tp/t/results/xml_tests/node_and_bye.pl
@@ -109,8 +109,7 @@ $result_texts{'node_and_bye'} = '
 $result_nodes{'node_and_bye'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
@@ -129,8 +128,7 @@ 
$result_nodes{'node_and_bye'}{'structure'}{'associated_unit'}{'structure'}{'dire
 $result_menus{'node_and_bye'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'associated_unit' => {
diff --git a/tp/t/results/xml_tests/node_no_section.pl 
b/tp/t/results/xml_tests/node_no_section.pl
index ce275b7854..b45d4f8450 100644
--- a/tp/t/results/xml_tests/node_no_section.pl
+++ b/tp/t/results/xml_tests/node_no_section.pl
@@ -72,16 +72,14 @@ $result_texts{'node_no_section'} = '';
 $result_nodes{'node_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'node_no_section'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 9148b9af25..c8ea58985d 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1640,11 +1640,9 @@ $result_sectioning{'block_commands_in_table'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             }
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -1661,23 +1659,19 @@ $result_nodes{'block_commands_in_table'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
 $result_menus{'block_commands_in_table'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   }
 };
 
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 698bd6f803..cb9c5844ea 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -3033,12 +3033,10 @@ $result_sectioning{'inter_item_commands_in_table'} = {
           'associated_node' => {
             'cmdname' => 'node',
             'extra' => {
-              'normalized' => 'Top',
-              'spaces_before_argument' => ' '
+              'normalized' => 'Top'
             },
             'structure' => {}
-          },
-          'spaces_before_argument' => ' '
+          }
         },
         'structure' => {
           'level' => 0,
@@ -3049,12 +3047,10 @@ $result_sectioning{'inter_item_commands_in_table'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'chapter',
-                    'spaces_before_argument' => ' '
+                    'normalized' => 'chapter'
                   },
                   'structure' => {}
-                },
-                'spaces_before_argument' => ' '
+                }
               },
               'structure' => {
                 'level' => 1,
@@ -3081,15 +3077,12 @@ $result_nodes{'inter_item_commands_in_table'} = {
   'extra' => {
     'associated_section' => {
       'cmdname' => 'top',
-      'extra' => {
-        'spaces_before_argument' => ' '
-      },
+      'extra' => {},
       'structure' => {
         'level' => 0
       }
     },
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {
     'node_next' => {
@@ -3097,16 +3090,13 @@ $result_nodes{'inter_item_commands_in_table'} = {
       'extra' => {
         'associated_section' => {
           'cmdname' => 'chapter',
-          'extra' => {
-            'spaces_before_argument' => ' '
-          },
+          'extra' => {},
           'structure' => {
             'level' => 1,
             'number' => 1
           }
         },
-        'normalized' => 'chapter',
-        'spaces_before_argument' => ' '
+        'normalized' => 'chapter'
       },
       'structure' => {
         'node_prev' => {},
@@ -3121,8 +3111,7 @@ 
$result_nodes{'inter_item_commands_in_table'}{'structure'}{'node_next'}{'structu
 $result_menus{'inter_item_commands_in_table'} = {
   'cmdname' => 'node',
   'extra' => {
-    'normalized' => 'Top',
-    'spaces_before_argument' => ' '
+    'normalized' => 'Top'
   },
   'structure' => {}
 };
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index aafd6669b9..6e9f909453 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -470,10 +470,11 @@ sub new_test($;$$$)
 }
 
 my @contents_keys = ('contents', 'args', 'parent',
-  'line_nr', 'node_content', 
-  'nodes_manuals', 'misc_content', 'invalid_nesting', 
-  'block_command_line_contents', 'spaces_after_command');
+  'line_nr', 'node_content',  'nodes_manuals', 'misc_content', 
'invalid_nesting', 
+  'block_command_line_contents', 'spaces_after_command', 
'spaces_before_argument',
+  'end_command', 'text_arg', 'command_argument');
 my @menus_keys = ('menu_next', 'menu_up', 'menu_prev', 'menu_up_hash');
+# 'level' 'number'
 my @sections_keys = ('section_next', 'section_prev', 'section_up', 
   'section_childs', 'associated_node', 'part_associated_section', 
   'toplevel_prev', 'toplevel_next', 'toplevel_up');
@@ -491,7 +492,7 @@ sub filter_tree_keys { [grep {!$avoided_keys_tree{$_}} ( 
sort keys %{$_[0]} )] }
 
 my %avoided_keys_sectioning;
 my @avoided_keys_sectioning = ('section_next', @contents_keys, @menus_keys, 
-  @node_keys, 'menu_child', 'toplevel_next');
+  @node_keys, 'menu_child', 'manual_content', 'toplevel_next');
 foreach my $avoided_key(@avoided_keys_sectioning) {
   $avoided_keys_sectioning{$avoided_key} = 1;
 }



reply via email to

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