texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Common.pm (_copy_tree, _substitute_r


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Common.pm (_copy_tree, _substitute_references), tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type), tp/Texinfo/ParserNonXS.pm (_register_extra_menu_entry_information), tp/Texinfo/Structuring.pm (_check_menu_entry) (set_menus_node_directions, associate_internal_references) (new_node_menu_entry), tp/Texinfo/Transformations.pm (_normalized_entry_associated_internal_node), tp/Texinfo/XS/parsetexi/menus.c (register_extra_menu_entry_information): put node_content and node_manual [...]
Date: Mon, 27 Feb 2023 06:39:58 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new ca2a13f6f2 * tp/Texinfo/Common.pm (_copy_tree, 
_substitute_references), tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type), 
tp/Texinfo/ParserNonXS.pm (_register_extra_menu_entry_information), 
tp/Texinfo/Structuring.pm (_check_menu_entry) (set_menus_node_directions, 
associate_internal_references) (new_node_menu_entry), 
tp/Texinfo/Transformations.pm (_normalized_entry_associated_internal_node), 
tp/Texinfo/XS/parsetexi/menus.c (register_extra_menu_entry_information): put 
node_con [...]
ca2a13f6f2 is described below

commit ca2a13f6f25571c9c20558413fc2a8d757a98a2d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Feb 27 12:39:50 2023 +0100

    * tp/Texinfo/Common.pm (_copy_tree, _substitute_references),
    tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type),
    tp/Texinfo/ParserNonXS.pm (_register_extra_menu_entry_information),
    tp/Texinfo/Structuring.pm (_check_menu_entry)
    (set_menus_node_directions, associate_internal_references)
    (new_node_menu_entry), tp/Texinfo/Transformations.pm
    (_normalized_entry_associated_internal_node),
    tp/Texinfo/XS/parsetexi/menus.c
    (register_extra_menu_entry_information): put node_content and
    node_manual information directly in the menu_entry_node element,
    not in the menu_entry, remove menu_entry_node_label.
---
 ChangeLog                                          |   14 +
 tp/TODO                                            |    5 +
 tp/Texinfo/Common.pm                               |   21 +-
 tp/Texinfo/Convert/HTML.pm                         |    7 +-
 tp/Texinfo/ParserNonXS.pm                          |   21 +-
 tp/Texinfo/Structuring.pm                          |  159 +--
 tp/Texinfo/Transformations.pm                      |   27 +-
 tp/Texinfo/XS/parsetexi/menus.c                    |   13 +-
 .../converters_tests/contents_at_document_begin.pl |   16 +-
 .../contents_at_document_begin_inline.pl           |   16 +-
 .../contents_at_document_begin_separate_element.pl |   16 +-
 tp/t/results/converters_tests/non_empty_part.pl    |   32 +-
 .../non_empty_part_no_top_node_output.pl           |   32 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |   32 +-
 .../some_at_commands_in_ref_nodes.pl               |   68 +-
 .../converters_tests/spaces_in_empty_node_names.pl |   52 +-
 .../converters_tests/spaces_in_node_names.pl       |   64 +-
 .../converters_tests/things_before_setfilename.pl  |   16 +-
 .../things_before_setfilename_no_element.pl        |   16 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |   16 +-
 .../two_footnotes_in_nodes_separate.pl             |   16 +-
 .../docbook_tests/special_docbook_unnumbered.pl    |   64 +-
 tp/t/results/float/complex_float.pl                |   16 +-
 tp/t/results/float/float_copying.pl                |   16 +-
 .../float/numbering_captions_listoffloats.pl       |  128 +-
 .../formats_encodings/at_commands_in_refs.pl       | 1252 ++++++++++----------
 .../at_commands_in_refs_latin1.pl                  | 1252 ++++++++++----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 1252 ++++++++++----------
 .../char_latin1_latin1_in_refs.pl                  |   80 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |   80 +-
 .../char_latin2_latin2_in_refs.pl                  |   16 +-
 .../formats_encodings/japanese_shift_jis.pl        |   32 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |   48 +-
 tp/t/results/html_tests/check_htmlxref.pl          |   46 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |   46 +-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |   46 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |   46 +-
 tp/t/results/html_tests/contents_at_end.pl         |   16 +-
 tp/t/results/html_tests/contents_at_end_inline.pl  |   16 +-
 .../html_tests/contents_at_end_separate_element.pl |   16 +-
 .../html_tests/contents_in_middle_chapter.pl       |   32 +-
 .../contents_in_middle_chapter_inline.pl           |   32 +-
 .../contents_in_middle_chapter_separate_element.pl |   32 +-
 .../html_tests/contents_in_middle_section.pl       |   48 +-
 .../contents_in_middle_section_inline.pl           |   48 +-
 .../contents_in_middle_section_separate_element.pl |   48 +-
 tp/t/results/html_tests/double_contents.pl         |   32 +-
 .../html_tests/double_contents_after_title.pl      |   32 +-
 .../double_contents_after_title_show_title.pl      |   32 +-
 ...double_contents_after_title_show_title_nodes.pl |   32 +-
 tp/t/results/html_tests/double_contents_book.pl    |   32 +-
 tp/t/results/html_tests/double_contents_chapter.pl |   32 +-
 tp/t/results/html_tests/double_contents_inline.pl  |   32 +-
 .../html_tests/double_contents_inline_chapter.pl   |   32 +-
 .../html_tests/double_contents_inline_nodes.pl     |   32 +-
 .../html_tests/double_contents_inline_section.pl   |   32 +-
 tp/t/results/html_tests/double_contents_nodes.pl   |   32 +-
 tp/t/results/html_tests/double_contents_section.pl |   32 +-
 .../html_tests/double_contents_separate_element.pl |   32 +-
 .../double_contents_separate_element_chapter.pl    |   32 +-
 .../double_contents_separate_element_nodes.pl      |   32 +-
 .../double_contents_separate_element_section.pl    |   32 +-
 tp/t/results/html_tests/float_copying.pl           |   16 +-
 tp/t/results/html_tests/no_content.pl              |   16 +-
 tp/t/results/html_tests/no_content_do_contents.pl  |   16 +-
 .../html_tests/no_content_do_contents_inline.pl    |   16 +-
 .../no_content_do_contents_separate_element.pl     |   16 +-
 tp/t/results/html_tests/no_content_inline.pl       |   16 +-
 .../html_tests/no_content_separate_element.pl      |   16 +-
 tp/t/results/html_tests/node_footnote_end.pl       |   80 +-
 tp/t/results/html_tests/node_footnote_separated.pl |   80 +-
 tp/t/results/html_tests/node_footnote_use_node.pl  |   80 +-
 .../html_tests/node_footnote_use_node_separate.pl  |   80 +-
 tp/t/results/html_tests/redirection_same_labels.pl |   80 +-
 tp/t/results/html_tests/ref_in_preformatted.pl     |   16 +-
 tp/t/results/html_tests/sectioning_frames.pl       |  208 ++--
 tp/t/results/html_tests/simple_menu.pl             |  112 +-
 tp/t/results/html_tests/simple_menu_in_example.pl  |   62 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   16 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |   16 +-
 tp/t/results/html_tests/top_node_up_explicit.pl    |   16 +-
 .../html_tests/top_node_up_explicit_no_nodes.pl    |   16 +-
 tp/t/results/html_tests/top_node_up_implicit.pl    |   16 +-
 .../html_tests/top_node_up_implicit_no_nodes.pl    |   16 +-
 tp/t/results/htmlxref/htmlxref.pl                  |   64 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |   64 +-
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |   64 +-
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |   64 +-
 tp/t/results/htmlxref/htmlxref_only_split.pl       |   64 +-
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |   64 +-
 tp/t/results/indices/double_index_entry.pl         |   16 +-
 tp/t/results/indices/index_entry_before_node.pl    |   32 +-
 .../index_entry_in_footnote_different_node_end.pl  |   32 +-
 .../indices/index_entry_in_footnote_separate.pl    |   32 +-
 tp/t/results/indices/index_nodes.pl                |   64 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |   64 +-
 tp/t/results/indices/index_special_region.pl       |   16 +-
 .../index_special_region_no_insertcopying.pl       |   16 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |   16 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |   16 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |   16 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |   16 +-
 .../index_special_region_titlepage_no_nodes.pl     |   16 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |   16 +-
 tp/t/results/indices/index_split.pl                |  176 ++-
 .../indices/index_split_split_chapter_no_nodes.pl  |  176 ++-
 tp/t/results/indices/index_table.pl                |   64 +-
 .../results/indices/index_table_chapter_no_node.pl |   64 +-
 tp/t/results/indices/nodes_before_top.pl           |   80 +-
 .../nodes_before_top_and_sections_chapter.pl       |  112 +-
 ...odes_before_top_and_sections_chapter_no_node.pl |  112 +-
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  112 +-
 .../indices/nodes_before_top_split_chapter.pl      |   80 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |   80 +-
 .../indices/printindex_index_entry_in_copying.pl   |   16 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   16 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   16 +-
 tp/t/results/indices/split_chapter_index.pl        |   48 +-
 tp/t/results/info_tests/before_node_and_section.pl |   32 +-
 .../info_tests/colons_in_index_entries_and_node.pl |   48 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |   48 +-
 tp/t/results/info_tests/direntry_dircategory.pl    |   64 +-
 .../direntry_dircategory_and_commands.pl           |   34 +-
 .../end_of_line_command_in_node_lines.pl           |   96 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |   32 +-
 .../info_tests/invalid_node_name_no_warning.pl     |   60 +-
 .../info_tests/invalid_node_name_warning.pl        |   60 +-
 .../info_tests/one_node_counted_elements.pl        |   14 +-
 tp/t/results/info_tests/quote_node_names_info.pl   |  100 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |   14 +-
 tp/t/results/info_tests/space_in_menu.pl           |   16 +-
 tp/t/results/info_tests/split_no_copying.pl        |   16 +-
 tp/t/results/info_tests/split_nocopying.pl         |   16 +-
 tp/t/results/info_tests/split_nocopying_split.pl   |   16 +-
 .../info_tests/split_test_before_first_node.pl     |   16 +-
 .../split_test_before_first_node_no_empty_line.pl  |   16 +-
 tp/t/results/info_tests/test_index.pl              |   32 +-
 tp/t/results/info_tests/text_before_node.pl        |   16 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   16 +-
 .../def_not_closed_in_menu_description.pl          |   14 +-
 .../invalid_nestings/menu_in_style_command.pl      |   14 +-
 .../style_not_closed_no_newline_root_commands.pl   |   16 +-
 .../style_not_closed_root_commands.pl              |   16 +-
 .../table_not_closed_in_menu_comment.pl            |   14 +-
 .../table_not_closed_in_menu_description.pl        |   14 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |   80 +-
 .../languages/multiple_lang_chapters_latex.pl      |   80 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |   80 +-
 .../latex_tests/custom_heading_with_include.pl     |   32 +-
 .../custom_heading_with_include_in_command.pl      |   32 +-
 tp/t/results/layout/navigation.pl                  |   48 +-
 tp/t/results/layout/navigation_chapter.pl          |   48 +-
 .../results/layout/navigation_chapter_no_header.pl |   48 +-
 .../navigation_chapter_no_header_vertical.pl       |   48 +-
 tp/t/results/layout/navigation_chapter_vertical.pl |   48 +-
 tp/t/results/layout/navigation_no_header.pl        |   48 +-
 .../layout/navigation_no_header_vertical.pl        |   48 +-
 tp/t/results/layout/navigation_node.pl             |   48 +-
 tp/t/results/layout/navigation_node_no_header.pl   |   48 +-
 .../layout/navigation_node_no_header_vertical.pl   |   48 +-
 tp/t/results/layout/navigation_node_vertical.pl    |   48 +-
 tp/t/results/layout/navigation_section.pl          |   48 +-
 .../results/layout/navigation_section_no_header.pl |   48 +-
 .../navigation_section_no_header_vertical.pl       |   48 +-
 tp/t/results/layout/navigation_section_vertical.pl |   48 +-
 .../layout/navigation_test_misc_file_collision.pl  |   48 +-
 tp/t/results/layout/navigation_vertical.pl         |   48 +-
 tp/t/results/layout/no_monolithic.pl               |   16 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   16 +-
 tp/t/results/macro/bib_example.pl                  |   32 +-
 tp/t/results/macro/glossary.pl                     |   16 +-
 .../macro/macro_for_dot_in_menu_not_separator.pl   |   16 +-
 tp/t/results/macro/macro_in_empty_menu_comment.pl  |   16 +-
 tp/t/results/macro/macro_in_menu.pl                |   80 +-
 .../macro_in_menu_comment_closed_by_detailmenu.pl  |   16 +-
 tp/t/results/macro/macro_in_menu_description.pl    |   16 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |   16 +-
 .../menu/block_commands_in_menu_description.pl     |   14 +-
 tp/t/results/menu/comment_on_menu_line.pl          |   16 +-
 tp/t/results/menu/dash_in_menu.pl                  |   24 +-
 tp/t/results/menu/detailmenu.pl                    |   32 +-
 tp/t/results/menu/detailmenu_in_description.pl     |   32 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  128 +-
 tp/t/results/menu/detailmenu_unknown_node.pl       |   16 +-
 .../menu/direntry_dircategory_after_first_node.pl  |   14 +-
 tp/t/results/menu/empty_menu_description.pl        |   28 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |   30 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |   64 +-
 tp/t/results/menu/example_in_menu_comment.pl       |   16 +-
 tp/t/results/menu/example_in_menu_description.pl   |   14 +-
 tp/t/results/menu/formats_in_menu.pl               |   56 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   14 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |  120 +-
 tp/t/results/menu/menu_entry_name.pl               |  244 ++--
 tp/t/results/menu/menu_entry_name_comment.pl       |  124 +-
 tp/t/results/menu/menu_entry_no_entry_location.pl  |   42 +-
 tp/t/results/menu/menu_entry_node.pl               |  104 +-
 tp/t/results/menu/menu_entry_node_comments.pl      |  100 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   14 +-
 tp/t/results/menu/menu_in_example.pl               |   62 +-
 .../menu/menu_no_closed_after_empty_line.pl        |   14 +-
 tp/t/results/menu/menu_no_closed_in_description.pl |   14 +-
 tp/t/results/menu/menu_node_unterminated.pl        |   20 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   16 +-
 tp/t/results/menu/menu_title_before_entries.pl     |   16 +-
 .../results/menu/missing_detailmenu_on_subnodes.pl |  128 +-
 tp/t/results/menu/multiple_menus.pl                |   48 +-
 tp/t/results/menu/reference_to_external_manual.pl  |   14 +-
 tp/t/results/menu/sc_in_menu.pl                    |   40 +-
 tp/t/results/menu/simple.pl                        |   84 +-
 tp/t/results/menu/simple_no_menu.pl                |   84 +-
 .../menu/space_and_commands_in_menu_node.pl        |  200 ++--
 tp/t/results/menu/verb_in_menu_description.pl      |   14 +-
 tp/t/results/moresectioning/anchor_in_footnote.pl  |   16 +-
 .../moresectioning/anchor_in_footnote_separate.pl  |   16 +-
 .../moresectioning/character_and_spaces_in_refs.pl |   80 +-
 .../character_and_spaces_in_refs_out.pl            |   80 +-
 tp/t/results/moresectioning/complex.pl             |  224 ++--
 .../moresectioning/complex_split_at_node.pl        |  224 ++--
 .../contents_at_end_document_after_node.pl         |   16 +-
 tp/t/results/moresectioning/empty_top_node_up.pl   |   16 +-
 .../equivalent_nodes_defined_linked.pl             |   16 +-
 .../results/moresectioning/internal_top_node_up.pl |   16 +-
 .../moresectioning/lowered_subsubsection.pl        |   96 +-
 .../moresectioning/more_sections_than_nodes.pl     |   64 +-
 tp/t/results/moresectioning/no_element.pl          |   16 +-
 .../non_automatic_internal_top_node_up.pl          |   16 +-
 .../non_automatic_top_node_up_and_url.pl           |   16 +-
 .../non_automatic_top_node_up_url.pl               |   16 +-
 .../moresectioning/placed_things_before_element.pl |   16 +-
 .../moresectioning/placed_things_before_node.pl    |   16 +-
 tp/t/results/moresectioning/raiselowersections.pl  |   80 +-
 tp/t/results/moresectioning/rec_nodes.pl           |  112 +-
 .../moresectioning/section_in_unnumbered_info.pl   |  496 ++++----
 .../section_in_unnumbered_plaintext.pl             |  496 ++++----
 .../moresectioning/special_spaces_in_nodes.pl      |  128 +-
 tp/t/results/moresectioning/top_node_up_url.pl     |   16 +-
 tp/t/results/moresectioning/topic_guide.pl         |  192 ++-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |   32 +-
 .../plaintext_tests/line_passed_and_formats.pl     |   24 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  100 +-
 tp/t/results/regions/ref_in_copying.pl             |   16 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |   16 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |   16 +-
 .../chapter_between_nodes_with_appendix.pl         |   16 +-
 .../chapter_between_nodes_with_appendix_nomenu.pl  |   16 +-
 .../chapter_node_before_and_after_part.pl          |   16 +-
 tp/t/results/sectioning/contents_and_parts.pl      |   48 +-
 tp/t/results/sectioning/double_part.pl             |   16 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |   32 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   32 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |   16 +-
 .../results/sectioning/explicit_node_directions.pl |   32 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |   56 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |   64 +-
 .../in_menu_only_special_spaces_node_menu.pl       |   64 +-
 tp/t/results/sectioning/lone_Top_node.pl           |   16 +-
 tp/t/results/sectioning/loop_nodes.pl              |   48 +-
 tp/t/results/sectioning/menutextorder.pl           |   96 +-
 tp/t/results/sectioning/next_in_menu_is_below.pl   |   64 +-
 tp/t/results/sectioning/next_no_prev_to_node.pl    |   32 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |   86 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |   32 +-
 .../sectioning/node_part_chapter_after_top.pl      |   16 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |   16 +-
 tp/t/results/sectioning/node_up_external_node.pl   |   16 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |   56 +-
 .../nodes_after_top_before_chapter_nodes.pl        |   32 +-
 .../nodes_after_top_before_chapter_not_split.pl    |   32 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |   32 +-
 .../nodes_after_top_before_chapter_sections.pl     |   32 +-
 .../nodes_after_top_before_chapter_texi2html.pl    |   32 +-
 ...p_before_chapter_texi2html_use_nodes_chapter.pl |   32 +-
 .../nodes_after_top_before_section_nodes.pl        |   32 +-
 .../nodes_after_top_before_section_sections.pl     |   32 +-
 ...s_after_top_before_section_texi2html_chapter.pl |   32 +-
 ...after_top_before_section_texi2html_use_nodes.pl |   32 +-
 ...p_before_section_texi2html_use_nodes_chapter.pl |   32 +-
 tp/t/results/sectioning/nodes_before_top.pl        |   32 +-
 .../nodes_no_node_top_explicit_directions.pl       |   16 +-
 tp/t/results/sectioning/novalidate.pl              |   16 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |   16 +-
 tp/t/results/sectioning/part_node_after_top.pl     |   16 +-
 tp/t/results/sectioning/part_node_before_top.pl    |   16 +-
 .../sectioning/part_node_chapter_after_top.pl      |   32 +-
 .../sectioning/part_node_chapter_appendix.pl       |   16 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |   32 +-
 .../sectioning/part_node_node_part_appendix.pl     |   32 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |   16 +-
 .../sectioning/part_node_part_node_appendix.pl     |   32 +-
 .../sectioning/protected_node_parentheses.pl       |   20 +-
 tp/t/results/sectioning/section_before_top.pl      |   16 +-
 .../results/sectioning/section_below_unnumbered.pl |   32 +-
 .../sectioning/section_chapter_before_top_nodes.pl |   32 +-
 tp/t/results/sectioning/semi_auto.pl               |   48 +-
 tp/t/results/sectioning/space_in_node.pl           |   52 +-
 .../sectioning/top_node_no_menu_direction.pl       |   32 +-
 .../transliterated_split_equivalent_nodes.pl       |   48 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |   48 +-
 .../sectioning/two_nodes_between_chapters.pl       |   48 +-
 tp/t/results/sectioning/unknown_node_in_menu.pl    |   16 +-
 tp/t/results/transformations/master_menu_fr.pl     |   50 +-
 tp/t/results/value/value_in_node.pl                |   36 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |   40 +-
 304 files changed, 7981 insertions(+), 9730 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 533cb45492..be1378ea53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2023-02-27  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (_copy_tree, _substitute_references),
+       tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type),
+       tp/Texinfo/ParserNonXS.pm (_register_extra_menu_entry_information),
+       tp/Texinfo/Structuring.pm (_check_menu_entry)
+       (set_menus_node_directions, associate_internal_references)
+       (new_node_menu_entry), tp/Texinfo/Transformations.pm
+       (_normalized_entry_associated_internal_node),
+       tp/Texinfo/XS/parsetexi/menus.c
+       (register_extra_menu_entry_information): put node_content and
+       node_manual information directly in the menu_entry_node element,
+       not in the menu_entry, remove menu_entry_node_label.
+
 2023-02-26  Gavin Smith <gavinsmith0123@gmail.com>
 
        Add NO_GRATUITOUS_UTF8 (name could change)
diff --git a/tp/TODO b/tp/TODO
index 2cff7f8efd..df6b82dbb9 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,6 +13,11 @@ Before next release
 Bugs
 ====
 
+To check, there could be memory leaks of node_content/manual_content
+that are not deallocated when the tree is free'd.  If this is the case, it
+may not be easy to fix, as they may have some content in common with
+the element argument.
+
 HTML API
 ========
 
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index e59cb370d8..af10fe5ddd 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1768,7 +1768,6 @@ sub _collect_commands_list_in_tree($$$)
 # extra->node_content
 # extra->node_argument
 # extra->explanation_contents
-# extra->menu_entry_node_label
 
 sub _copy_tree($$$);
 sub _copy_tree($$$)
@@ -1803,10 +1802,13 @@ sub _copy_tree($$$)
   if ($current->{'extra'}) {
     $new->{'extra'} = {};
     foreach my $key (keys %{$current->{'extra'}}) {
-      if ($current->{'cmdname'} and $current->{'cmdname'} eq 'multitable'
-          and $key eq 'prototypes') {
+      if (($current->{'cmdname'} and $current->{'cmdname'} eq 'multitable'
+           and $key eq 'prototypes')
+          or ($current->{'type'} and $current->{'type'} eq 'menu_entry_node'
+              and ($key eq 'node_content' or $key eq 'node_manual'))) {
         $new->{'extra'}->{$key} = [];
-        $reference_associations->{$current->{'extra'}->{$key}} = $new->{$key};
+        $reference_associations->{$current->{'extra'}->{$key}}
+          = $new->{'extra'}->{$key};
         foreach my $child (@{$current->{'extra'}->{$key}}) {
           push @{$new->{'extra'}->{$key}},
                   _copy_tree($child, $new, $reference_associations);
@@ -1896,18 +1898,17 @@ sub _substitute_references($$$)
               $current->{'extra'}->{$key}, $reference_associations,
               "[$command_or_type]{$key}");
           } else {
-            if ($key eq 'index_entry'
-                or ($current->{'type'}
-                    and $current->{'type'} eq 'menu_entry'
-                    and $key eq 'menu_entry_node_label')) {
+            if ($key eq 'index_entry') {
               $new->{'extra'}->{$key} = {};
               foreach my $type_key (keys(%{$current->{'extra'}->{$key}})) {
                 if (ref($current->{'extra'}->{$key}->{$type_key}) eq '') {
                   $new->{'extra'}->{$key}->{$type_key}
                     = $current->{'extra'}->{$key}->{$type_key};
-                } elsif 
($reference_associations->{$current->{'extra'}->{$key}->{$type_key}}) {
+                } elsif ($reference_associations->{
+                                 $current->{'extra'}->{$key}->{$type_key}}) {
                   $new->{'extra'}->{$key}->{$type_key}
-                    = 
$reference_associations->{$current->{'extra'}->{$key}->{$type_key}};
+                    = $reference_associations->{
+                                      
$current->{'extra'}->{$key}->{$type_key}};
                 } elsif (ref($current->{'extra'}->{$key}->{$type_key}) eq 
'ARRAY') {
                   $new->{'extra'}->{$key}->{$type_key}
                     = _substitute_references_in_array(
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 436d033152..2b07716fc8 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6500,9 +6500,8 @@ sub _convert_menu_entry_type($$$)
   my $href = '';
   my $rel = '';
   my $section;
-  my $label_info;
-  $label_info = $element->{'extra'}->{'menu_entry_node_label'}
-     if ($element->{'extra'});
+  my $label_info = $menu_entry_node->{'extra'};
+
   # external node
   my $external_node;
   if ($label_info and $label_info->{'manual_content'}) {
@@ -6523,7 +6522,7 @@ sub _convert_menu_entry_type($$$)
       } else {
         $href = $self->command_href($node, undef, $element);
       }
-      if ($node->{'extra'}->{'isindex'}) {
+      if ($node->{'extra'} and $node->{'extra'}->{'isindex'}) {
         # Mark the target as an index.  See
         # 
http://microformats.org/wiki/existing-rel-values#HTML5_link_type_extensions
         $rel = ' rel="index"';
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 48699f188a..27b71cfcd3 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4441,8 +4441,16 @@ sub _register_extra_menu_entry_information($$;$)
         }
       } else {
         my $parsed_entry_node = _parse_node_manual($arg);
-        $current->{'extra'} = {} if (!$current->{'extra'});
-        $current->{'extra'}->{'menu_entry_node_label'} = $parsed_entry_node;
+        if (defined($parsed_entry_node)) {
+          foreach my $label_info (keys(%$parsed_entry_node)) {
+            $arg->{'extra'} = {} if (!$arg->{'extra'});
+            $arg->{'extra'}->{$label_info}
+              = [@{$parsed_entry_node->{$label_info}}];
+          }
+        } else {
+          $self->_bug_message("No label info for menu_entry_node contents",
+                              $source_info, $current);
+        }
       }
     }
   }
@@ -8466,12 +8474,11 @@ I<code> is set depending on the context and 
C<@kbdinputstyle>.
 I<invalid_syntax> is set if there was an error on the C<@macro>
 line.  C<info> key hash I<arg_line> holds the line after C<@macro>.
 
-=item C<menu_entry>
+=item C<menu_entry_node>
 
-The I<menu_entry_node_label> value is a hash with information about the
-node entry label; its keys are the same as those appearing in the
-C<@node> I<line_arg> explicit directions arguments C<extra> hash
-labels information.
+Extra keys with information about the node entry label same as those
+appearing in the C<@node> I<line_arg> explicit directions arguments
+C<extra> hash labels information.
 
 =item C<@multitable>
 
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 22296a93ee..f79104c4ac 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -370,34 +370,36 @@ my %direction_texts = (
  'up' => 'Up'
 );
 
-sub _check_menu_entry($$$$$)
+sub _check_menu_entry($$$$$$)
 {
   my $registrar = shift;
   my $customization_information = shift;
   my $labels = shift;
   my $command = shift;
   my $menu_content = shift;
+  my $menu_entry_node = shift;
 
-  my $normalized_menu_node
-      = $menu_content->{'extra'}->{'menu_entry_node_label'}->{'normalized'};
+  if (defined($menu_entry_node->{'extra'}->{'normalized'})) {
+    my $normalized_menu_node = $menu_entry_node->{'extra'}->{'normalized'};
 
-  my $menu_node = $labels->{$normalized_menu_node};
+    my $menu_node = $labels->{$normalized_menu_node};
 
-  if (!$menu_node) {
-    $registrar->line_error($customization_information,
-      sprintf(__("\@%s reference to nonexistent node `%s'"), $command,
-        
node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node_label'})),
-      $menu_content->{'source_info'});
-  } else {
-    if (!_check_node_same_texinfo_code($menu_node,
-                           
$menu_content->{'extra'}->{'menu_entry_node_label'})) {
-      $registrar->line_warn($customization_information,
-       sprintf(__("\@%s entry node name `%s' different from %s name `%s'"),
-         $command,
-         
node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node_label'}),
-         $menu_node->{'cmdname'},
-         target_element_to_texi_label($menu_node)),
-       $menu_content->{'source_info'});
+    if (!$menu_node) {
+      $registrar->line_error($customization_information,
+                  sprintf(__("\@%s reference to nonexistent node `%s'"),
+                          $command,
+                          node_extra_to_texi($menu_entry_node->{'extra'})),
+                            $menu_content->{'source_info'});
+    } else {
+      if (!_check_node_same_texinfo_code($menu_node, 
$menu_entry_node->{'extra'})) {
+        $registrar->line_warn($customization_information,
+        sprintf(__("\@%s entry node name `%s' different from %s name `%s'"),
+                $command,
+                node_extra_to_texi($menu_entry_node->{'extra'}),
+                $menu_node->{'cmdname'},
+                target_element_to_texi_label($menu_node)),
+                               $menu_content->{'source_info'});
+      }
     }
   }
 }
@@ -509,36 +511,39 @@ sub set_menus_node_directions($$$$$$)
           $menu_contents = $menu->{'contents'}->[0];
         }
         foreach my $menu_content (@{$menu_contents->{'contents'}}) {
-          if ($menu_content->{'extra'}
-             and $menu_content->{'extra'}->{'menu_entry_node_label'}) {
+          if ($menu_content->{'type'}
+              and $menu_content->{'type'} eq 'menu_entry') {
             my $menu_node;
             my $external_node;
-            if (!$menu_content->{'extra'}->{'menu_entry_node_label'}
-                                                   ->{'manual_content'}) {
-              $menu_node = $labels->{
-                      $menu_content->{'extra'}
-                              ->{'menu_entry_node_label'}->{'normalized'}};
-
-              if ($check_menu_entries) {
-                _check_menu_entry($registrar, $customization_information,
-                                  $labels, 'menu', $menu_content);
-              }
-              # this may happen more than once for a given node if the node
-              # is in more than one menu.  Therefore all the menu up node
-              # are kept in $menu_node->{'structure'}->{'menu_up_hash'}
-              if ($menu_node) {
-                $menu_node->{'structure'} = {} if (!$menu_node->{'structure'});
-                $menu_node->{'structure'}->{'menu_up'} = $node;
-                $menu_node->{'structure'}->{'menu_up_hash'} = {}
-                    if (!$menu_node->{'structure'}->{'menu_up_hash'});
-                $menu_node->{'structure'}->{'menu_up_hash'}
+            foreach my $arg (@{$menu_content->{'contents'}}) {
+              if ($arg->{'type'} eq 'menu_entry_node') {
+                if ($arg->{'extra'}) {
+                  if (!$arg->{'extra'}->{'manual_content'}) {
+                    if ($check_menu_entries) {
+                      _check_menu_entry($registrar, $customization_information,
+                                        $labels, 'menu', $menu_content, $arg);
+                    }
+                    # this may happen more than once for a given node if the 
node
+                    # is in more than one menu.  Therefore all the menu up node
+                    # are kept in $menu_node->{'structure'}->{'menu_up_hash'}
+                    $menu_node = $labels->{$arg->{'extra'}->{'normalized'}};
+                    if ($menu_node) {
+                      $menu_node->{'structure'} = {} if 
(!$menu_node->{'structure'});
+                      $menu_node->{'structure'}->{'menu_up'} = $node;
+                      $menu_node->{'structure'}->{'menu_up_hash'} = {}
+                          if (!$menu_node->{'structure'}->{'menu_up_hash'});
+                      $menu_node->{'structure'}->{'menu_up_hash'}
                                     ->{$node->{'extra'}->{'normalized'}} = 1;
+                    }
+                  } else {
+                    $external_node = 1;
+                    # FIXME use directly arg?
+                    #$menu_node = $arg;
+                    $menu_node = {'extra' => $arg->{'extra'}};
+                  }
+                }
+                last;
               }
-            } else {
-              $external_node = 1;
-              $menu_node
-                = {'extra'
-                   => $menu_content->{'extra'}->{'menu_entry_node_label'}};
             }
             if ($menu_node) {
               if ($previous_node) {
@@ -568,12 +573,14 @@ sub set_menus_node_directions($$$$$$)
     if ($global_commands->{'detailmenu'}) {
       foreach my $detailmenu (@{$global_commands->{'detailmenu'}}) {
         foreach my $menu_content (@{$detailmenu->{'contents'}}) {
-          if ($menu_content->{'extra'}
-             and $menu_content->{'extra'}->{'menu_entry_node_label'}) {
-            if (!$menu_content->{'extra'}->{'menu_entry_node_label'}
-                                                   ->{'manual_content'}) {
-              _check_menu_entry($registrar, $customization_information,
-                                $labels, 'detailmenu', $menu_content);
+          if ($menu_content->{'type'}
+              and $menu_content->{'type'} eq 'menu_entry') {
+            foreach my $arg (@{$menu_content->{'contents'}}) {
+              if ($arg->{'type'} eq 'menu_entry_node' and $arg->{'extra'}
+                  and !$arg->{'extra'}->{'node_manual'}) {
+                _check_menu_entry($registrar, $customization_information,
+                                  $labels, 'detailmenu', $menu_content, $arg);
+              }
             }
           }
         }
@@ -1469,7 +1476,7 @@ sub print_element_directions($)
 }
 
 # For each internal reference command, set the 'normalized' key in the
-# 'menu_entry_node_label' for menu entries, and 'node_argument' for @*ref.
+# 'menu_entry_node' extra for menu entries, and 'node_argument' for @*ref.
 # Set the 'label' key in the 'extra' hash of the reference tree element
 # with 'node_argument' to the associated labeled tree element.
 sub associate_internal_references($$$$$)
@@ -1483,15 +1490,18 @@ sub associate_internal_references($$$$$)
   return if (!defined($refs));
   foreach my $ref (@$refs) {
     my $node_arg;
-    $node_arg = $ref->{'extra'}->{'menu_entry_node_label'} if 
($ref->{'extra'});
-
-    if (defined $node_arg) {
-      if ($node_arg->{'node_content'}) {
-        my $normalized =
-             Texinfo::Convert::NodeNameNormalization::normalize_node(
-                {'contents' => $node_arg->{'node_content'} });
-        $node_arg->{'normalized'} = $normalized
-          if (defined $normalized and $normalized ne '');
+    if ($ref->{'type'} and $ref->{'type'} eq 'menu_entry') {
+      foreach my $arg (@{$ref->{'contents'}}) {
+        if ($arg->{'type'} eq 'menu_entry_node') {
+          if ($arg->{'extra'} and $arg->{'extra'}->{'node_content'}) {
+            my $normalized =
+              Texinfo::Convert::NodeNameNormalization::normalize_node(
+                {'contents' => $arg->{'extra'}->{'node_content'} });
+            $arg->{'extra'}->{'normalized'} = $normalized
+              if (defined $normalized and $normalized ne '');
+          }
+          last;
+        }
       }
       next;
     }
@@ -1684,15 +1694,22 @@ sub new_node_menu_entry
     $arg->{'parent'} = $entry;
   }
 
-  my $modified_node_content;
-  ($entry->{'extra'}->{'menu_entry_node_label'}, $modified_node_content) =
-    Texinfo::Common::parse_node_manual($menu_entry_node);
-  $menu_entry_node->{'contents'} = $modified_node_content;
-  my $content = $entry->{'extra'}->{'menu_entry_node_label'}->{'node_content'};
-  if ($content) {
-    $entry->{'extra'}->{'menu_entry_node_label'}->{'normalized'}
-     = Texinfo::Convert::NodeNameNormalization::normalize_node(
-                                        {'contents' => $content } );
+  my ($parsed_node_manual, $modified_node_content)
+    = Texinfo::Common::parse_node_manual($menu_entry_node);
+  $menu_entry_node->{'contents'} = $modified_node_content
+    if ($modified_node_content);
+  if (defined($parsed_node_manual)) {
+    foreach my $label_info (keys(%$parsed_node_manual)) {
+      $menu_entry_node->{'extra'} = {} if (!$menu_entry_node->{'extra'});
+      $menu_entry_node->{'extra'}->{$label_info}
+         = [@{$parsed_node_manual->{$label_info}}];
+
+      if ($label_info eq 'node_content') {
+        $menu_entry_node->{'extra'}->{'normalized'}
+          = Texinfo::Convert::NodeNameNormalization::normalize_node(
+             {'contents' => $menu_entry_node->{'extra'}->{$label_info}});
+      }
+    }
   }
 
   return $entry;
@@ -2205,7 +2222,7 @@ X<C<associate_internal_references>>
 
 Verify that internal references (C<@ref> and similar without fourth of
 fifth argument and menu entries) have an associated node, anchor or float.
-Set the C<normalized> key in the C<extra> hash C<menu_entry_node_label> hash 
for
+Set the C<normalized> key in the C<extra> hash C<menu_entry_node> hash for
 menu entries and in the C<extra> hash C<node_argument> hash for internal
 references C<@ref> and similar @-commands.  Set the C<label> key in the
 C<extra> hash of the reference tree element to the associated labeled tree
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 29b7bd419d..a4a33b8fbc 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -600,20 +600,19 @@ sub _normalized_entry_associated_internal_node($;$)
   my $entry = shift;
   my $labels = shift;
 
-  my $entry_node = $entry->{'extra'}->{'menu_entry_node_label'};
-  # 'normalized' is added by 
Texinfo::Structuring::associate_internal_references
-  # so it could be possible not to have 'normalized' set.  In that case, it 
could
-  # still be determined with NodeNameNormalization::normalize_node.
-  my $normalized_entry_node = $entry_node->{'normalized'};
-  #my $normalized_entry_node
-  #  = Texinfo::Convert::NodeNameNormalization::normalize_node(
-  #                   {'contents' => $entry_node->{'node_content'}});
-  if (! $entry_node->{'manual_content'}
-      and defined($normalized_entry_node)) {
-    if ($labels) {
-      return ($normalized_entry_node, $labels->{$normalized_entry_node});
-    } else {
-      return ($normalized_entry_node, undef);
+  foreach my $arg (@{$entry->{'contents'}}) {
+    if ($arg->{'type'} eq 'menu_entry_node') {
+      if (! $arg->{'extra'}->{'manual_content'}) {
+        my $normalized_entry_node = $arg->{'extra'}->{'normalized'};
+        if (defined($normalized_entry_node)) {
+          if ($labels) {
+            return ($normalized_entry_node, $labels->{$normalized_entry_node});
+          } else {
+            return ($normalized_entry_node, undef);
+          }
+        }
+      }
+      last;
     }
   }
   return (undef, undef);
diff --git a/tp/Texinfo/XS/parsetexi/menus.c b/tp/Texinfo/XS/parsetexi/menus.c
index de07f9d7f2..df63a798a1 100644
--- a/tp/Texinfo/XS/parsetexi/menus.c
+++ b/tp/Texinfo/XS/parsetexi/menus.c
@@ -25,7 +25,7 @@
 #include "labels.h"
 #include "source_marks.h"
 
-/* Save 'menu_entry_node_label' extra keys on the top-level @menu element. */
+/* Save 'menu_entry_node' extra keys. */
 void
 register_extra_menu_entry_information (ELEMENT *current)
 {
@@ -58,8 +58,15 @@ register_extra_menu_entry_information (ELEMENT *current)
                 line_error ("empty node name in menu entry");
             }
           else
-            add_extra_node_spec (current, "menu_entry_node_label",
-                                 parsed_entry_node);
+            {
+              if (parsed_entry_node->node_content)
+                add_extra_contents (arg, "node_content",
+                                    parsed_entry_node->node_content);
+              if (parsed_entry_node->manual_content)
+                add_extra_contents (arg, "manual_content",
+                                    parsed_entry_node->manual_content);
+            }
+          free (parsed_entry_node);
         }
     }
 }
diff --git a/tp/t/results/converters_tests/contents_at_document_begin.pl 
b/tp/t/results/converters_tests/contents_at_document_begin.pl
index e17e188fff..a58e1e2241 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -148,6 +148,12 @@ $result_trees{'contents_at_document_begin'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'contents_at_document_begin'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 11,
@@ -337,7 +335,7 @@ $result_trees{'contents_at_document_begin'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
index e9d1bc6044..819ba84a36 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
@@ -148,6 +148,12 @@ $result_trees{'contents_at_document_begin_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'contents_at_document_begin_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 11,
@@ -337,7 +335,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index c2ea8d6b0a..0ce3db829a 100644
--- 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
+++ 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
@@ -148,6 +148,12 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_at_document_begin.texi',
                 'line_nr' => 11,
@@ -337,7 +335,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index d392adca19..22e4db2c0c 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -143,6 +143,12 @@ $result_trees{'non_empty_part'} = {
                       'text' => 'chapter node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -164,14 +170,6 @@ $result_trees{'non_empty_part'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -191,6 +189,12 @@ $result_trees{'non_empty_part'} = {
                       'text' => 'part chapter node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'part-chapter-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -212,14 +216,6 @@ $result_trees{'non_empty_part'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'part-chapter-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -822,8 +818,8 @@ $result_trees{'non_empty_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'non_empty_part'}{'contents'}[3]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[1];
 $result_trees{'non_empty_part'}{'contents'}[5]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[4];
 $result_trees{'non_empty_part'}{'contents'}[9]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[8];
diff --git a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl 
b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index 31f2c796cd..349c8e7930 100644
--- a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
+++ b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
@@ -143,6 +143,12 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
                       'text' => 'chapter node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -164,14 +170,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -191,6 +189,12 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
                       'text' => 'part chapter node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'part-chapter-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -212,14 +216,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'part-chapter-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -821,8 +817,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[1];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[5]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[4];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[9]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[8];
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 6f7be2b617..5b3727c787 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -265,6 +265,12 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -286,14 +292,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -313,6 +311,12 @@ $result_trees{'ref_in_sectioning'} = {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -334,14 +338,6 @@ $result_trees{'ref_in_sectioning'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -1752,8 +1748,8 @@ 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'ext
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'extra'}{'label'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'ref_in_sectioning'}{'contents'}[3] = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'};
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 b5c9ba55f7..8a28ebc60d 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
@@ -328,6 +328,25 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -349,27 +368,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -1435,20 +1433,20 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[13];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
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 0b7908a720..8a12fe6eb9 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
@@ -63,6 +63,13 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       'cmdname' => ' '
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -84,15 +91,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -131,6 +129,12 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -152,14 +156,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -179,6 +175,12 @@ $result_trees{'spaces_in_empty_node_names'} = {
                       'cmdname' => ' '
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -200,14 +202,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -578,10 +572,10 @@ $result_trees{'spaces_in_empty_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
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 0d0c29c3ae..edacee3101 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -66,6 +66,14 @@ $result_trees{'spaces_in_node_names'} = {
                       'cmdname' => ' '
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -87,16 +95,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -138,6 +136,13 @@ $result_trees{'spaces_in_node_names'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'b-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -159,15 +164,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'b-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -190,6 +186,13 @@ $result_trees{'spaces_in_node_names'} = {
                       'cmdname' => ' '
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'c-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -211,15 +214,6 @@ $result_trees{'spaces_in_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'c-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -620,13 +614,13 @@ $result_trees{'spaces_in_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'spaces_in_node_names'}{'contents'}[2];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 1c55afac8e..790e7ac476 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -568,6 +568,12 @@ $result_trees{'things_before_setfilename'} = {
                           'text' => 'An anchor'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'An-anchor'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -589,14 +595,6 @@ $result_trees{'things_before_setfilename'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'An-anchor'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename.texi',
                     'line_nr' => 35,
@@ -1056,7 +1054,7 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 045de4506c..24115a29e3 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
@@ -568,6 +568,12 @@ $result_trees{'things_before_setfilename_no_element'} = {
                           'text' => 'An anchor'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'An-anchor'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -589,14 +595,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'An-anchor'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => 'things_before_setfilename_no_element.texi',
                     'line_nr' => 35,
@@ -918,7 +916,7 @@ 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
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 9b0bb004bd..87727c5d07 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -206,6 +206,12 @@ $result_trees{'two_footnotes_in_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -227,14 +233,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -479,7 +477,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes'} = '@node Top
 @top 2 footnotes in 2 nodes
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 3b2a917e9b..1fcab1e0cf 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
@@ -241,6 +241,12 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -262,14 +268,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -514,7 +512,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes_separate'} = '@footnotestyle separate
 @node Top
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 14e99b6d82..a08dc7fc22 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -106,6 +106,12 @@ $result_trees{'special_docbook_unnumbered'} = {
                       'text' => 'Dedication'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Dedication'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -127,14 +133,6 @@ $result_trees{'special_docbook_unnumbered'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Dedication'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -154,6 +152,12 @@ $result_trees{'special_docbook_unnumbered'} = {
                       'text' => 'preface'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'preface'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -175,14 +179,6 @@ $result_trees{'special_docbook_unnumbered'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'preface'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -202,6 +198,12 @@ $result_trees{'special_docbook_unnumbered'} = {
                       'text' => 'colophon'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'colophon'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -223,14 +225,6 @@ $result_trees{'special_docbook_unnumbered'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'colophon'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -250,6 +244,12 @@ $result_trees{'special_docbook_unnumbered'} = {
                       'text' => 'acknowledgements'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'acknowledgements'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -271,14 +271,6 @@ $result_trees{'special_docbook_unnumbered'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'acknowledgements'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -673,10 +665,10 @@ $result_trees{'special_docbook_unnumbered'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'special_docbook_unnumbered'} = '@node Top
 @top top
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index b39ef5abbd..27b3f3222f 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -153,6 +153,12 @@ $result_trees{'complex_float'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -174,14 +180,6 @@ $result_trees{'complex_float'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -3543,7 +3541,7 @@ $result_trees{'complex_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 066453243f..d7f7d008b7 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -654,6 +654,12 @@ $result_trees{'float_copying'} = {
                       'text' => 'Copying and floats'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-floats'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -675,14 +681,6 @@ $result_trees{'float_copying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-floats'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -935,7 +933,7 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'float_copying'}{'contents'}[3] = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
 
 $result_texis{'float_copying'} = '@copying
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 9637440b07..2bdf3b4449 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -1213,6 +1213,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1234,14 +1240,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 57,
@@ -1261,6 +1259,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'Unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1282,14 +1286,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 58,
@@ -1309,6 +1305,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'Chapter with unnumbsubsec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chapter-with-unnumbsubsec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1330,14 +1332,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chapter-with-unnumbsubsec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 59,
@@ -1357,6 +1351,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'Appendix for float'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Appendix-for-float'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1378,14 +1378,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Appendix-for-float'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 60,
@@ -1405,6 +1397,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'list of floats'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'list-of-floats'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1426,14 +1424,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'list-of-floats'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 61,
@@ -2416,6 +2406,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2437,14 +2433,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 98,
@@ -2763,6 +2751,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'Section within unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section-within-unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2784,14 +2778,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section-within-unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 114,
@@ -3475,6 +3461,12 @@ $result_trees{'numbering_captions_listoffloats'} = {
                       'text' => 'unnumbered sec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3496,14 +3488,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 143,
@@ -4962,11 +4946,11 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
@@ -4986,9 +4970,9 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3];
@@ -5004,7 +4988,7 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3];
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 a5374b0fa3..de2a9a83cb 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -110,6 +110,16 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '}'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-_007b-_007d'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -131,18 +141,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-_007b-_007d'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -210,6 +208,28 @@ $result_trees{'at_commands_in_refs'} = {
                       'cmdname' => '@'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-_0021-_002e-_002e-_003f-_0040'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -231,30 +251,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -348,6 +344,20 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -369,22 +379,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0040-_007b-_007d-_005c-_0023'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -510,6 +504,24 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -531,26 +543,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -660,6 +652,22 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -681,24 +689,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -760,6 +750,16 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_2265-_2264-_2192'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -781,18 +781,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_2265-_2264-_2192'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -918,6 +906,24 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -939,26 +945,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -1052,6 +1038,20 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_21d2-_00b0-a-b-_00e5'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1073,22 +1073,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_21d2-_00b0-a-b-_00e5'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -1326,6 +1310,38 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1347,40 +1363,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -1640,6 +1622,32 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1661,34 +1669,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -1849,6 +1829,24 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1870,26 +1868,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -1996,6 +1974,16 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0131-_1e14-_1e08'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2017,18 +2005,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0131-_1e14-_1e08'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -2138,6 +2114,22 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2159,24 +2151,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -2286,6 +2260,22 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2307,24 +2297,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -2344,6 +2316,12 @@ $result_trees{'at_commands_in_refs'} = {
                       'text' => '`` \'\' --- -- ` \''
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2365,14 +2343,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -2462,6 +2432,16 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'AAA-AAA-BBB'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2483,18 +2463,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'AAA-AAA-BBB'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -2584,6 +2552,16 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'CCC-CCC-DDD'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2605,18 +2583,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'CCC-CCC-DDD'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -2697,6 +2663,14 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2718,16 +2692,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -2821,6 +2785,14 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2842,16 +2814,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'f_002d_002dile1-f_002d_002dile'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -2890,6 +2852,12 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '-_0040-_007b_007d-_002e-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2911,14 +2879,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '-_0040-_007b_007d-_002e-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -3163,6 +3123,28 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3184,30 +3166,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -3386,6 +3344,24 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3407,26 +3383,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -3464,6 +3420,13 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => '8_002e27in'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3485,15 +3448,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => '8_002e27in'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -3549,6 +3503,14 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'sansserif-slanted'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3570,16 +3532,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'sansserif-slanted'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -3614,6 +3566,12 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'indicateurl'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3635,14 +3593,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'indicateurl'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -3698,6 +3648,14 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'gH-3rd'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3719,16 +3677,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'gH-3rd'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -3829,6 +3777,16 @@ $result_trees{'at_commands_in_refs'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3850,18 +3808,6 @@ $result_trees{'at_commands_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -14313,238 +14259,238 @@ $result_trees{'at_commands_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[26];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
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 73e7105792..9add47e0da 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
@@ -182,6 +182,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '}'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-_007b-_007d'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -203,18 +213,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-_007b-_007d'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -282,6 +280,28 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'cmdname' => '@'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-_0021-_002e-_002e-_003f-_0040'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -303,30 +323,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -420,6 +416,20 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -441,22 +451,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0040-_007b-_007d-_005c-_0023'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -582,6 +576,24 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -603,26 +615,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -732,6 +724,22 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -753,24 +761,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -832,6 +822,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_2265-_2264-_2192'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -853,18 +853,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_2265-_2264-_2192'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -990,6 +978,24 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1011,26 +1017,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -1124,6 +1110,20 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_21d2-_00b0-a-b-_00e5'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1145,22 +1145,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_21d2-_00b0-a-b-_00e5'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -1398,6 +1382,38 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1419,40 +1435,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -1712,6 +1694,32 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1733,34 +1741,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -1921,6 +1901,24 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1942,26 +1940,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -2068,6 +2046,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0131-_1e14-_1e08'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2089,18 +2077,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0131-_1e14-_1e08'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -2210,6 +2186,22 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2231,24 +2223,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -2358,6 +2332,22 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2379,24 +2369,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -2416,6 +2388,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       'text' => '`` \'\' --- -- ` \''
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2437,14 +2415,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -2534,6 +2504,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'AAA-AAA-BBB'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2555,18 +2535,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'AAA-AAA-BBB'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -2656,6 +2624,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'CCC-CCC-DDD'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2677,18 +2655,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'CCC-CCC-DDD'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -2769,6 +2735,14 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2790,16 +2764,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -2893,6 +2857,14 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2914,16 +2886,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'f_002d_002dile1-f_002d_002dile'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -2962,6 +2924,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '-_0040-_007b_007d-_002e-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2983,14 +2951,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '-_0040-_007b_007d-_002e-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -3235,6 +3195,28 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3256,30 +3238,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -3458,6 +3416,24 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3479,26 +3455,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -3536,6 +3492,13 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => '8_002e27in'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3557,15 +3520,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => '8_002e27in'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -3621,6 +3575,14 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'sansserif-slanted'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3642,16 +3604,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'sansserif-slanted'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -3686,6 +3638,12 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'indicateurl'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3707,14 +3665,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'indicateurl'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -3770,6 +3720,14 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'gH-3rd'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3791,16 +3749,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'gH-3rd'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -3901,6 +3849,16 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3922,18 +3880,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -14385,238 +14331,238 @@ $result_trees{'at_commands_in_refs_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[26];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
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 aa99e7630f..905a6334d9 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
@@ -182,6 +182,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '}'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-_007b-_007d'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -203,18 +213,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-_007b-_007d'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -282,6 +280,28 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'cmdname' => '@'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '-_0021-_002e-_002e-_003f-_0040'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -303,30 +323,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '-_0021-_002e-_002e-_003f-_0040'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -420,6 +416,20 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0040-_007b-_007d-_005c-_0023'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -441,22 +451,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0040-_007b-_007d-_005c-_0023'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -582,6 +576,24 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -603,26 +615,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -732,6 +724,22 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -753,24 +761,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -832,6 +822,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_2265-_2264-_2192'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -853,18 +853,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_2265-_2264-_2192'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -990,6 +978,24 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1011,26 +1017,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -1124,6 +1110,20 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_21d2-_00b0-a-b-_00e5'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1145,22 +1145,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_21d2-_00b0-a-b-_00e5'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -1398,6 +1382,38 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1419,40 +1435,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -1712,6 +1694,32 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1733,34 +1741,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -1921,6 +1901,24 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1942,26 +1940,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -2068,6 +2046,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0131-_1e14-_1e08'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2089,18 +2077,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0131-_1e14-_1e08'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -2210,6 +2186,22 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2231,24 +2223,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -2358,6 +2332,22 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2379,24 +2369,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -2416,6 +2388,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       'text' => '`` \'\' --- -- ` \''
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2437,14 +2415,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 22,
@@ -2534,6 +2504,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'AAA-AAA-BBB'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2555,18 +2535,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'AAA-AAA-BBB'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 23,
@@ -2656,6 +2624,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'CCC-CCC-DDD'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2677,18 +2655,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'CCC-CCC-DDD'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -2769,6 +2735,14 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2790,16 +2764,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'someone_0040somewher-no_005fexplain_0040there'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -2893,6 +2857,14 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'f_002d_002dile1-f_002d_002dile'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2914,16 +2886,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'f_002d_002dile1-f_002d_002dile'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -2962,6 +2924,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '-_0040-_007b_007d-_002e-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2983,14 +2951,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '-_0040-_007b_007d-_002e-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -3235,6 +3195,28 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3256,30 +3238,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -3458,6 +3416,24 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3479,26 +3455,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -3536,6 +3492,13 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => '8_002e27in'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3557,15 +3520,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => '8_002e27in'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -3621,6 +3575,14 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'sansserif-slanted'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3642,16 +3604,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'sansserif-slanted'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -3686,6 +3638,12 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'indicateurl'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3707,14 +3665,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'indicateurl'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -3770,6 +3720,14 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'gH-3rd'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3791,16 +3749,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'gH-3rd'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -3901,6 +3849,16 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3922,18 +3880,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -14385,238 +14331,238 @@ $result_trees{'at_commands_in_refs_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node_label'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node_label'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[26];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
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 28573f4d60..4cb7f31ee2 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
@@ -153,6 +153,12 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} 
\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -174,14 +180,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 9,
@@ -201,6 +199,12 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => "\x{e9}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e9'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -222,14 +226,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e9'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 10,
@@ -249,6 +245,12 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => "\x{e0} \x{e8} \x{f9}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0-_00e8-_00f9'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -270,14 +272,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0-_00e8-_00f9'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 11,
@@ -297,6 +291,12 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} 
\x{ca} \x{ce} \x{d4} \x{db}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -318,14 +318,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 12,
@@ -345,6 +337,12 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                       'text' => "\x{e7}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e7'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -366,14 +364,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e7'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_latin1_in_refs.texi',
                 'line_nr' => 13,
@@ -1240,11 +1230,11 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[3];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[5];
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 918bd09733..3d16ccdd88 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
@@ -193,6 +193,12 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} 
\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -214,14 +220,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 11,
@@ -241,6 +239,12 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => "\x{e9}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e9'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -262,14 +266,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e9'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 12,
@@ -289,6 +285,12 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => "\x{e0} \x{e8} \x{f9}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0-_00e8-_00f9'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -310,14 +312,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0-_00e8-_00f9'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 13,
@@ -337,6 +331,12 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} 
\x{ca} \x{ce} \x{d4} \x{db}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -358,14 +358,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 14,
@@ -385,6 +377,12 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                       'text' => "\x{e7}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e7'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -406,14 +404,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e7'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin1_utf8_in_refs.texi',
                 'line_nr' => 15,
@@ -1240,11 +1230,11 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[3];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[5];
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 0565bcc89b..52843caa20 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
@@ -281,6 +281,12 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                       'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_0104-_0105-_02db-_0118-_0119'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -302,14 +308,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_0104-_0105-_02db-_0118-_0119'
-                }
-              },
               'source_info' => {
                 'file_name' => 'char_latin2_latin2_in_refs.texi',
                 'line_nr' => 14,
@@ -470,7 +468,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
   'type' => 'document_root'
 };
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[3] = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index fe6776a825..c2ba2c6d76 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -429,6 +429,12 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'Preface'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Preface'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -450,14 +456,6 @@ $result_trees{'japanese_shift_jis'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Preface'
-                }
-              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 26,
@@ -477,6 +475,12 @@ $result_trees{'japanese_shift_jis'} = {
                       'text' => 'Introduction'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Introduction'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -498,14 +502,6 @@ $result_trees{'japanese_shift_jis'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Introduction'
-                }
-              },
               'source_info' => {
                 'file_name' => 'japanese_shift_jis.texi',
                 'line_nr' => 27,
@@ -754,8 +750,8 @@ $result_trees{'japanese_shift_jis'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'japanese_shift_jis'} = '\\input texinfo @c -*- coding: utf-8; 
mode: texinfo; -*-
 @documentencoding shift_jis
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index f57a02e6fd..c65122e28f 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -590,6 +590,12 @@ $result_trees{'sample_utf8'} = {
                       'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First 
Chapter\x{ff09}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -615,14 +621,6 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 34,
@@ -642,6 +640,12 @@ $result_trees{'sample_utf8'} = {
                       'text' => "Second Chapter AE \x{104}\x{118} ae 
\x{105}\x{119}"
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -663,14 +667,6 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 36,
@@ -690,6 +686,12 @@ $result_trees{'sample_utf8'} = {
                       'text' => 'Index node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Index-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -711,14 +713,6 @@ $result_trees{'sample_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Index-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
                 'line_nr' => 37,
@@ -1377,9 +1371,9 @@ $result_trees{'sample_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index fd18438d80..1a5ded1543 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -310,6 +310,12 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -331,14 +337,6 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -364,6 +362,11 @@ $result_trees{'check_htmlxref'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -385,13 +388,6 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -411,6 +407,12 @@ $result_trees{'check_htmlxref'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -432,14 +434,6 @@ $result_trees{'check_htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -688,9 +682,9 @@ 
$result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'extra'}{'node_content
 
$result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl 
b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
index 94f25f1900..c6cb6c305b 100644
--- a/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
+++ b/tp/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
@@ -310,6 +310,12 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -331,14 +337,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -364,6 +362,11 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -385,13 +388,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -411,6 +407,12 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -432,14 +434,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -688,9 +682,9 @@ 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[2]{'ext
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index 927569aea4..ce2133a30d 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -310,6 +310,12 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -331,14 +337,6 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -364,6 +362,11 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -385,13 +388,6 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -411,6 +407,12 @@ $result_trees{'check_htmlxref_menu'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -432,14 +434,6 @@ $result_trees{'check_htmlxref_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -688,9 +682,9 @@ 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[2]{'extra'}{'node_co
 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl 
b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
index eb654a7e02..48608b5929 100644
--- a/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
+++ b/tp/t/results/html_tests/check_htmlxref_no_use_nodes.pl
@@ -310,6 +310,12 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -331,14 +337,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -364,6 +362,11 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -385,13 +388,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -411,6 +407,12 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -432,14 +434,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -688,9 +682,9 @@ 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[2]{'extra'}{
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/html_tests/contents_at_end.pl 
b/tp/t/results/html_tests/contents_at_end.pl
index 598c800e5f..e25ec47f91 100644
--- a/tp/t/results/html_tests/contents_at_end.pl
+++ b/tp/t/results/html_tests/contents_at_end.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_at_end'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_at_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
                 'line_nr' => 9,
@@ -331,7 +329,7 @@ $result_trees{'contents_at_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_end'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_at_end_inline.pl 
b/tp/t/results/html_tests/contents_at_end_inline.pl
index 022cf6f25f..3f427ba906 100644
--- a/tp/t/results/html_tests/contents_at_end_inline.pl
+++ b/tp/t/results/html_tests/contents_at_end_inline.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_at_end_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_at_end_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
                 'line_nr' => 9,
@@ -331,7 +329,7 @@ $result_trees{'contents_at_end_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_end_inline'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_at_end_separate_element.pl 
b/tp/t/results/html_tests/contents_at_end_separate_element.pl
index 213b35a2d9..0ef9de0a09 100644
--- a/tp/t/results/html_tests/contents_at_end_separate_element.pl
+++ b/tp/t/results/html_tests/contents_at_end_separate_element.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_at_end_separate_element'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_at_end_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_at_end.texi',
                 'line_nr' => 9,
@@ -331,7 +329,7 @@ $result_trees{'contents_at_end_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_end_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter.pl
index 3bffd6d597..fad08dd848 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_in_middle_chapter'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_in_middle_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
                 'line_nr' => 9,
@@ -331,6 +329,12 @@ $result_trees{'contents_in_middle_chapter'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -352,14 +356,6 @@ $result_trees{'contents_in_middle_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
                 'line_nr' => 19,
@@ -520,8 +516,8 @@ $result_trees{'contents_in_middle_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_chapter'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
index 1ede96686d..6271feb88c 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
                 'line_nr' => 9,
@@ -331,6 +329,12 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -352,14 +356,6 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
                 'line_nr' => 19,
@@ -520,8 +516,8 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_chapter_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
index adc6e798c2..624e256dc6 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
@@ -127,6 +127,12 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
                 'line_nr' => 9,
@@ -331,6 +329,12 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -352,14 +356,6 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_chapter.texi',
                 'line_nr' => 19,
@@ -520,8 +516,8 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_chapter_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_section.pl 
b/tp/t/results/html_tests/contents_in_middle_section.pl
index 3b01206d28..c151d30232 100644
--- a/tp/t/results/html_tests/contents_in_middle_section.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_in_middle_section'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_in_middle_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 9,
@@ -307,6 +305,12 @@ $result_trees{'contents_in_middle_section'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -328,14 +332,6 @@ $result_trees{'contents_in_middle_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 17,
@@ -355,6 +351,12 @@ $result_trees{'contents_in_middle_section'} = {
                       'text' => 'section1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -376,14 +378,6 @@ $result_trees{'contents_in_middle_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 18,
@@ -642,9 +636,9 @@ $result_trees{'contents_in_middle_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_section_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
index 70f3102414..e1139b94dd 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_inline.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
@@ -127,6 +127,12 @@ $result_trees{'contents_in_middle_section_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 9,
@@ -307,6 +305,12 @@ $result_trees{'contents_in_middle_section_inline'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -328,14 +332,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 17,
@@ -355,6 +351,12 @@ $result_trees{'contents_in_middle_section_inline'} = {
                       'text' => 'section1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -376,14 +378,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 18,
@@ -642,9 +636,9 @@ $result_trees{'contents_in_middle_section_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
index 5e585a312d..3b55bf8efb 100644
--- a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
@@ -127,6 +127,12 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 9,
@@ -307,6 +305,12 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -328,14 +332,6 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 17,
@@ -355,6 +351,12 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                       'text' => 'section1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -376,14 +378,6 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'contents_in_middle_section.texi',
                 'line_nr' => 18,
@@ -642,9 +636,9 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents.pl 
b/tp/t/results/html_tests/double_contents.pl
index 6dd4a43568..7ef6fb258d 100644
--- a/tp/t/results/html_tests/double_contents.pl
+++ b/tp/t/results/html_tests/double_contents.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_after_title.pl 
b/tp/t/results/html_tests/double_contents_after_title.pl
index 28b06bc0de..5a5d7197f5 100644
--- a/tp/t/results/html_tests/double_contents_after_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_after_title'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_after_title'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_after_title'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_after_title'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_after_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_after_title'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_after_title_show_title.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
index 4033ccb0c8..9d0eea3b36 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_after_title_show_title'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_after_title_show_title'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_after_title_show_title'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_after_title_show_title'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_after_title_show_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_after_title_show_title'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
index 1be8642fd4..da8d750ab1 100644
--- a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
@@ -148,6 +148,12 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_after_title_show_title_nodes'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_book.pl 
b/tp/t/results/html_tests/double_contents_book.pl
index 30e099ffd6..32a547c104 100644
--- a/tp/t/results/html_tests/double_contents_book.pl
+++ b/tp/t/results/html_tests/double_contents_book.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_book'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_book'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_book'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_book'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_book'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_book'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_chapter.pl 
b/tp/t/results/html_tests/double_contents_chapter.pl
index 9799adb5ef..1aaac4575f 100644
--- a/tp/t/results/html_tests/double_contents_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_chapter.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_chapter'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_chapter'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_chapter'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline.pl 
b/tp/t/results/html_tests/double_contents_inline.pl
index 69a6a46599..f096fc0f4a 100644
--- a/tp/t/results/html_tests/double_contents_inline.pl
+++ b/tp/t/results/html_tests/double_contents_inline.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_inline'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline_chapter.pl 
b/tp/t/results/html_tests/double_contents_inline_chapter.pl
index 47ca37a526..f2584604ae 100644
--- a/tp/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_inline_chapter.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_inline_chapter'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_inline_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_inline_chapter'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_inline_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_inline_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline_nodes.pl 
b/tp/t/results/html_tests/double_contents_inline_nodes.pl
index 33a24c214b..18f4d2ad71 100644
--- a/tp/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_inline_nodes.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_inline_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_inline_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_inline_nodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_inline_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_inline_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline_section.pl 
b/tp/t/results/html_tests/double_contents_inline_section.pl
index 1727c077fe..92c2c168b4 100644
--- a/tp/t/results/html_tests/double_contents_inline_section.pl
+++ b/tp/t/results/html_tests/double_contents_inline_section.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_inline_section'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_inline_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_inline_section'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_inline_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_inline_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline_section'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_nodes.pl 
b/tp/t/results/html_tests/double_contents_nodes.pl
index 2110e1c0cb..604897fe8b 100644
--- a/tp/t/results/html_tests/double_contents_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_nodes.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_nodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_section.pl 
b/tp/t/results/html_tests/double_contents_section.pl
index e81497b81e..948ec87cd4 100644
--- a/tp/t/results/html_tests/double_contents_section.pl
+++ b/tp/t/results/html_tests/double_contents_section.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_section'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_section'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_section'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_separate_element.pl 
b/tp/t/results/html_tests/double_contents_separate_element.pl
index 06b969316b..25a0e75302 100644
--- a/tp/t/results/html_tests/double_contents_separate_element.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_separate_element'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_separate_element'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl 
b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
index 9cc4048de7..c9d3a8c325 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_chapter'} = '\\input texinfo 
@c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl 
b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
index 5f37a2cb40..f34cc7b2b3 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_separate_element_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_separate_element_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_section.pl 
b/tp/t/results/html_tests/double_contents_separate_element_section.pl
index 8d2f9dfcfc..f300625e00 100644
--- a/tp/t/results/html_tests/double_contents_separate_element_section.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element_section.pl
@@ -148,6 +148,12 @@ $result_trees{'double_contents_separate_element_section'} 
= {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,14 +175,6 @@ $result_trees{'double_contents_separate_element_section'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 11,
@@ -352,6 +350,12 @@ $result_trees{'double_contents_separate_element_section'} 
= {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -373,14 +377,6 @@ $result_trees{'double_contents_separate_element_section'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'double_contents.texi',
                 'line_nr' => 21,
@@ -542,8 +538,8 @@ $result_trees{'double_contents_separate_element_section'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_section'} = '\\input texinfo 
@c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index 6cf24c6770..1d94eeaccc 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -843,6 +843,12 @@ $result_trees{'float_copying'} = {
                       'text' => 'Copying and floats'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-floats'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -864,14 +870,6 @@ $result_trees{'float_copying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-floats'
-                }
-              },
               'source_info' => {
                 'file_name' => 'float_copying.texi',
                 'line_nr' => 42,
@@ -1353,7 +1351,7 @@ 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'ext
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'float_copying'}{'contents'}[3] = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/html_tests/no_content.pl 
b/tp/t/results/html_tests/no_content.pl
index c2a855c49c..0833fdd310 100644
--- a/tp/t/results/html_tests/no_content.pl
+++ b/tp/t/results/html_tests/no_content.pl
@@ -127,6 +127,12 @@ $result_trees{'no_content'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'no_content'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_content.texi',
                 'line_nr' => 9,
@@ -316,7 +314,7 @@ $result_trees{'no_content'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_do_contents.pl 
b/tp/t/results/html_tests/no_content_do_contents.pl
index 883df7ccda..6376c12068 100644
--- a/tp/t/results/html_tests/no_content_do_contents.pl
+++ b/tp/t/results/html_tests/no_content_do_contents.pl
@@ -127,6 +127,12 @@ $result_trees{'no_content_do_contents'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'no_content_do_contents'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_content.texi',
                 'line_nr' => 9,
@@ -316,7 +314,7 @@ $result_trees{'no_content_do_contents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_do_contents'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_do_contents_inline.pl 
b/tp/t/results/html_tests/no_content_do_contents_inline.pl
index 0c315eb73a..1662542053 100644
--- a/tp/t/results/html_tests/no_content_do_contents_inline.pl
+++ b/tp/t/results/html_tests/no_content_do_contents_inline.pl
@@ -127,6 +127,12 @@ $result_trees{'no_content_do_contents_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'no_content_do_contents_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_content.texi',
                 'line_nr' => 9,
@@ -316,7 +314,7 @@ $result_trees{'no_content_do_contents_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_do_contents_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl 
b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
index c76abfc5e1..1ff26c1dfe 100644
--- a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
@@ -127,6 +127,12 @@ $result_trees{'no_content_do_contents_separate_element'} = 
{
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'no_content_do_contents_separate_element'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_content.texi',
                 'line_nr' => 9,
@@ -316,7 +314,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_do_contents_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_inline.pl 
b/tp/t/results/html_tests/no_content_inline.pl
index 32e36ead0b..ed87099880 100644
--- a/tp/t/results/html_tests/no_content_inline.pl
+++ b/tp/t/results/html_tests/no_content_inline.pl
@@ -127,6 +127,12 @@ $result_trees{'no_content_inline'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'no_content_inline'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_content.texi',
                 'line_nr' => 9,
@@ -316,7 +314,7 @@ $result_trees{'no_content_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_inline'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_separate_element.pl 
b/tp/t/results/html_tests/no_content_separate_element.pl
index 238de79fbe..2475e31555 100644
--- a/tp/t/results/html_tests/no_content_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_separate_element.pl
@@ -127,6 +127,12 @@ $result_trees{'no_content_separate_element'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'no_content_separate_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_content.texi',
                 'line_nr' => 9,
@@ -316,7 +314,7 @@ $result_trees{'no_content_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index a20f1d5e16..a0775316af 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -118,6 +118,12 @@ $result_trees{'node_footnote_end'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -139,14 +145,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 8,
@@ -181,6 +179,12 @@ $result_trees{'node_footnote_end'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -202,14 +206,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 9,
@@ -229,6 +225,12 @@ $result_trees{'node_footnote_end'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -250,14 +252,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 10,
@@ -292,6 +286,12 @@ $result_trees{'node_footnote_end'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -313,14 +313,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 11,
@@ -758,6 +750,12 @@ $result_trees{'node_footnote_end'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -779,14 +777,6 @@ $result_trees{'node_footnote_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 28,
@@ -1001,11 +991,11 @@ $result_trees{'node_footnote_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_end'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index 9d9933dd9b..5801b4a8dc 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -118,6 +118,12 @@ $result_trees{'node_footnote_separated'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -139,14 +145,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 8,
@@ -181,6 +179,12 @@ $result_trees{'node_footnote_separated'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -202,14 +206,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 9,
@@ -229,6 +225,12 @@ $result_trees{'node_footnote_separated'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -250,14 +252,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 10,
@@ -292,6 +286,12 @@ $result_trees{'node_footnote_separated'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -313,14 +313,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 11,
@@ -758,6 +750,12 @@ $result_trees{'node_footnote_separated'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -779,14 +777,6 @@ $result_trees{'node_footnote_separated'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 28,
@@ -1001,11 +991,11 @@ $result_trees{'node_footnote_separated'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_separated'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_use_node.pl 
b/tp/t/results/html_tests/node_footnote_use_node.pl
index 9e303a29e0..da0f2285c6 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -118,6 +118,12 @@ $result_trees{'node_footnote_use_node'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -139,14 +145,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 8,
@@ -181,6 +179,12 @@ $result_trees{'node_footnote_use_node'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -202,14 +206,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 9,
@@ -229,6 +225,12 @@ $result_trees{'node_footnote_use_node'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -250,14 +252,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 10,
@@ -292,6 +286,12 @@ $result_trees{'node_footnote_use_node'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -313,14 +313,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 11,
@@ -758,6 +750,12 @@ $result_trees{'node_footnote_use_node'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -779,14 +777,6 @@ $result_trees{'node_footnote_use_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 28,
@@ -1001,11 +991,11 @@ $result_trees{'node_footnote_use_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_use_node'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_use_node_separate.pl 
b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
index 38f5c019af..a2bc543d76 100644
--- a/tp/t/results/html_tests/node_footnote_use_node_separate.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
@@ -118,6 +118,12 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -139,14 +145,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 8,
@@ -181,6 +179,12 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -202,14 +206,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 9,
@@ -229,6 +225,12 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -250,14 +252,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 10,
@@ -292,6 +286,12 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -313,14 +313,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 11,
@@ -758,6 +750,12 @@ $result_trees{'node_footnote_use_node_separate'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => '_00e0'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -779,14 +777,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => '_00e0'
-                }
-              },
               'source_info' => {
                 'file_name' => 'node_footnote.texi',
                 'line_nr' => 28,
@@ -1001,11 +991,11 @@ $result_trees{'node_footnote_use_node_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_use_node_separate'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index f5777e0136..a2ae5f3d0a 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -151,6 +151,12 @@ $result_trees{'redirection_same_labels'} = [
                         'text' => 'umlaut'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'umlaut'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -172,14 +178,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'umlaut'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 8,
@@ -199,6 +197,12 @@ $result_trees{'redirection_same_labels'} = [
                         'text' => 'circumflex'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'circumflex'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -220,14 +224,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'circumflex'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 9,
@@ -397,6 +393,12 @@ $result_trees{'redirection_same_labels'} = [
                         }
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => '_00ef'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -418,14 +420,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => '_00ef'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 16,
@@ -475,6 +469,12 @@ $result_trees{'redirection_same_labels'} = [
                         }
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => '_0129'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -496,14 +496,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => '_0129'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 17,
@@ -796,6 +788,12 @@ $result_trees{'redirection_same_labels'} = [
                         }
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => '_00ee'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -817,14 +815,6 @@ $result_trees{'redirection_same_labels'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => '_00ee'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 28,
@@ -943,13 +933,13 @@ $result_trees{'redirection_same_labels'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[0]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2];
-$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[1]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1];
-$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
 
 $result_texis{'redirection_same_labels'} = '@node Top
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index d6b73f562f..db720c5ec2 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -60,6 +60,12 @@ $result_trees{'ref_in_preformatted'} = {
                       'text' => 'chap nnn the node name'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-nnn-the-node-name'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -81,14 +87,6 @@ $result_trees{'ref_in_preformatted'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-nnn-the-node-name'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -292,7 +290,7 @@ $result_trees{'ref_in_preformatted'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
 $result_trees{'ref_in_preformatted'}{'contents'}[2] = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'label'};
diff --git a/tp/t/results/html_tests/sectioning_frames.pl 
b/tp/t/results/html_tests/sectioning_frames.pl
index 14581f0644..0420643aaf 100644
--- a/tp/t/results/html_tests/sectioning_frames.pl
+++ b/tp/t/results/html_tests/sectioning_frames.pl
@@ -136,6 +136,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'First node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'First-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -230,14 +236,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'First-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 6,
@@ -276,6 +274,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'between node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'between-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -301,14 +305,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'between-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 13,
@@ -351,6 +347,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'Second node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Second-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -372,14 +374,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Second-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 18,
@@ -423,6 +417,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'Third node unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Third-node-unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -444,14 +444,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Third-node-unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 22,
@@ -471,6 +463,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'Last node no description'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Last-node-no-description'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -492,14 +490,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Last-node-no-description'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 23,
@@ -705,6 +695,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -726,14 +722,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 34,
@@ -753,6 +741,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'unnumbered2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -774,14 +768,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 35,
@@ -801,6 +787,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'numbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -822,14 +814,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 36,
@@ -991,6 +975,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'unnumbered sub'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1012,14 +1002,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 44,
@@ -1039,6 +1021,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'numbered sub'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1060,14 +1048,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 45,
@@ -1087,6 +1067,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'unnumbered sub2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1108,14 +1094,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 46,
@@ -1135,6 +1113,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'numbered sub2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1156,14 +1140,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 47,
@@ -1586,6 +1562,12 @@ $result_trees{'sectioning_frames'} = {
                       'text' => 'numbered sub3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1607,14 +1589,6 @@ $result_trees{'sectioning_frames'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'sectioning.texi',
                 'line_nr' => 66,
@@ -2228,21 +2202,21 @@ $result_trees{'sectioning_frames'} = {
 };
 
$result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[21]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[21]{'args'}[3]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[1]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index fc270114b3..4107a05c90 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -102,6 +102,11 @@ $result_trees{'simple_menu'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -109,13 +114,6 @@ $result_trees{'simple_menu'} = {
                       'type' => 'menu_entry_separator'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -585,6 +583,11 @@ $result_trees{'simple_menu'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -592,13 +595,6 @@ $result_trees{'simple_menu'} = {
                       'type' => 'menu_entry_separator'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 30,
@@ -642,6 +638,11 @@ $result_trees{'simple_menu'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -649,13 +650,6 @@ $result_trees{'simple_menu'} = {
                       'type' => 'menu_entry_separator'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 34,
@@ -689,6 +683,11 @@ $result_trees{'simple_menu'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -696,13 +695,6 @@ $result_trees{'simple_menu'} = {
                       'type' => 'menu_entry_separator'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 36,
@@ -756,6 +748,11 @@ $result_trees{'simple_menu'} = {
                               'text' => ')'
                             }
                           ],
+                          'extra' => {
+                            'manual_content' => [
+                              {}
+                            ]
+                          },
                           'type' => 'menu_entry_node'
                         },
                         {
@@ -763,13 +760,6 @@ $result_trees{'simple_menu'} = {
                           'type' => 'menu_entry_separator'
                         }
                       ],
-                      'extra' => {
-                        'menu_entry_node_label' => {
-                          'manual_content' => [
-                            {}
-                          ]
-                        }
-                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 39,
@@ -1239,6 +1229,11 @@ $result_trees{'simple_menu'} = {
                               'text' => ')'
                             }
                           ],
+                          'extra' => {
+                            'manual_content' => [
+                              {}
+                            ]
+                          },
                           'type' => 'menu_entry_node'
                         },
                         {
@@ -1246,13 +1241,6 @@ $result_trees{'simple_menu'} = {
                           'type' => 'menu_entry_separator'
                         }
                       ],
-                      'extra' => {
-                        'menu_entry_node_label' => {
-                          'manual_content' => [
-                            {}
-                          ]
-                        }
-                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 63,
@@ -1296,6 +1284,11 @@ $result_trees{'simple_menu'} = {
                               'text' => ')'
                             }
                           ],
+                          'extra' => {
+                            'manual_content' => [
+                              {}
+                            ]
+                          },
                           'type' => 'menu_entry_node'
                         },
                         {
@@ -1303,13 +1296,6 @@ $result_trees{'simple_menu'} = {
                           'type' => 'menu_entry_separator'
                         }
                       ],
-                      'extra' => {
-                        'menu_entry_node_label' => {
-                          'manual_content' => [
-                            {}
-                          ]
-                        }
-                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 67,
@@ -1343,6 +1329,11 @@ $result_trees{'simple_menu'} = {
                               'text' => ')'
                             }
                           ],
+                          'extra' => {
+                            'manual_content' => [
+                              {}
+                            ]
+                          },
                           'type' => 'menu_entry_node'
                         },
                         {
@@ -1350,13 +1341,6 @@ $result_trees{'simple_menu'} = {
                           'type' => 'menu_entry_separator'
                         }
                       ],
-                      'extra' => {
-                        'menu_entry_node_label' => {
-                          'manual_content' => [
-                            {}
-                          ]
-                        }
-                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 69,
@@ -1465,20 +1449,20 @@ $result_trees{'simple_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[8]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[8]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'simple_menu'} = '
 @node Top
diff --git a/tp/t/results/html_tests/simple_menu_in_example.pl 
b/tp/t/results/html_tests/simple_menu_in_example.pl
index bb2fa643a7..04d36bef97 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -80,6 +80,11 @@ $result_trees{'simple_menu_in_example'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -163,13 +168,6 @@ $result_trees{'simple_menu_in_example'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -288,6 +286,15 @@ $result_trees{'simple_menu_in_example'} = {
                           'text' => 'menu'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ],
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'menu'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -309,17 +316,6 @@ $result_trees{'simple_menu_in_example'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ],
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'menu'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -363,6 +359,15 @@ $result_trees{'simple_menu_in_example'} = {
                           'text' => 'node'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ],
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'node'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -384,17 +389,6 @@ $result_trees{'simple_menu_in_example'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ],
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'node'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -498,11 +492,11 @@ $result_trees{'simple_menu_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[4];
 
 $result_texis{'simple_menu_in_example'} = '@node Top
 
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 7ff74f5a12..dac2044fce 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -92,6 +92,12 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -412,7 +410,7 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[3];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[3];
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 887e1f5c49..c0baddd70a 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -138,6 +138,12 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -159,14 +165,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -419,7 +417,7 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[3];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[3];
diff --git a/tp/t/results/html_tests/top_node_up_explicit.pl 
b/tp/t/results/html_tests/top_node_up_explicit.pl
index aa0e23fb45..ca3e2a93a3 100644
--- a/tp/t/results/html_tests/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit.pl
@@ -176,6 +176,12 @@ $result_trees{'top_node_up_explicit'} = {
                       'text' => 'Chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -197,14 +203,6 @@ $result_trees{'top_node_up_explicit'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -353,7 +351,7 @@ $result_trees{'top_node_up_explicit'} = {
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_explicit'} = '@node Top, (dir), (weird), (dir)
 @top The top
diff --git a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
index 8788296707..69ff3a367b 100644
--- a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
@@ -176,6 +176,12 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
                       'text' => 'Chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -197,14 +203,6 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -353,7 +351,7 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_explicit_no_nodes'} = '@node Top, (dir), (weird), 
(dir)
 @top The top
diff --git a/tp/t/results/html_tests/top_node_up_implicit.pl 
b/tp/t/results/html_tests/top_node_up_implicit.pl
index 2501df7069..4e284a2863 100644
--- a/tp/t/results/html_tests/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit.pl
@@ -106,6 +106,12 @@ $result_trees{'top_node_up_implicit'} = {
                       'text' => 'Chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -127,14 +133,6 @@ $result_trees{'top_node_up_implicit'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -280,7 +278,7 @@ $result_trees{'top_node_up_implicit'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_implicit'} = '@node Top
 @top The top
diff --git a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
index cb7b24a91c..ad9dd6da12 100644
--- a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
@@ -106,6 +106,12 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
                       'text' => 'Chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -127,14 +133,6 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -280,7 +278,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_implicit_no_nodes'} = '@node Top
 @top The top
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 11e6a53b0d..77b31fde21 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -113,6 +113,12 @@ $result_trees{'htmlxref'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 7,
@@ -2359,6 +2357,12 @@ $result_trees{'htmlxref'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2380,14 +2384,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 79,
@@ -2407,6 +2403,12 @@ $result_trees{'htmlxref'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2428,14 +2430,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 80,
@@ -2455,6 +2449,12 @@ $result_trees{'htmlxref'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2476,14 +2476,6 @@ $result_trees{'htmlxref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 81,
@@ -2564,7 +2556,7 @@ $result_trees{'htmlxref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2589,9 +2581,9 @@ 
$result_trees{'htmlxref'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 
$result_trees{'htmlxref'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'htmlxref'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref'}{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'htmlxref'}{'contents'}[5] = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref'}{'contents'}[6] = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref'}{'contents'}[7] = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index bbd25e9361..f3ab140835 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -113,6 +113,12 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 7,
@@ -2359,6 +2357,12 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2380,14 +2384,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 79,
@@ -2407,6 +2403,12 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2428,14 +2430,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 80,
@@ -2455,6 +2449,12 @@ $result_trees{'htmlxref_nodes'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2476,14 +2476,6 @@ $result_trees{'htmlxref_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 81,
@@ -2564,7 +2556,7 @@ $result_trees{'htmlxref_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2589,9 +2581,9 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content
 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'htmlxref_nodes'}{'contents'}[5] = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_nodes'}{'contents'}[6] = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_nodes'}{'contents'}[7] = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index c0a9f461dd..1a1f780ee1 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -113,6 +113,12 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 7,
@@ -2359,6 +2357,12 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2380,14 +2384,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 79,
@@ -2407,6 +2403,12 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2428,14 +2430,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 80,
@@ -2455,6 +2449,12 @@ $result_trees{'htmlxref_only_mono'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2476,14 +2476,6 @@ $result_trees{'htmlxref_only_mono'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 81,
@@ -2564,7 +2556,7 @@ $result_trees{'htmlxref_only_mono'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2589,9 +2581,9 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[2]{'extra'}{'node_con
 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'htmlxref_only_mono'}{'contents'}[5] = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_mono'}{'contents'}[6] = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_mono'}{'contents'}[7] = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 9b49349a03..ed2d6e819c 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -113,6 +113,12 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 7,
@@ -2359,6 +2357,12 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2380,14 +2384,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 79,
@@ -2407,6 +2403,12 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2428,14 +2430,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 80,
@@ -2455,6 +2449,12 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2476,14 +2476,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 81,
@@ -2564,7 +2556,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2589,9 +2581,9 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'no
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5] = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6] = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7] = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index ff6513bf27..0cd2b09379 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -113,6 +113,12 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 7,
@@ -2359,6 +2357,12 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2380,14 +2384,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 79,
@@ -2407,6 +2403,12 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2428,14 +2430,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 80,
@@ -2455,6 +2449,12 @@ $result_trees{'htmlxref_only_split'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2476,14 +2476,6 @@ $result_trees{'htmlxref_only_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 81,
@@ -2564,7 +2556,7 @@ $result_trees{'htmlxref_only_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2589,9 +2581,9 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[2]{'extra'}{'node_co
 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'htmlxref_only_split'}{'contents'}[5] = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_split'}{'contents'}[6] = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_split'}{'contents'}[7] = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 21838f432a..4165f21cf1 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -113,6 +113,12 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 7,
@@ -2359,6 +2357,12 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2380,14 +2384,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 79,
@@ -2407,6 +2403,12 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2428,14 +2430,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 80,
@@ -2455,6 +2449,12 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2476,14 +2476,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'test_refs.texi',
                 'line_nr' => 81,
@@ -2564,7 +2556,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2589,9 +2581,9 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'n
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'htmlxref_only_split_nodes'}{'contents'}[5] = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_split_nodes'}{'contents'}[6] = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'htmlxref_only_split_nodes'}{'contents'}[7] = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 066fff804b..70604e6ee9 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -168,6 +168,12 @@ $result_trees{'double_index_entry'} = {
                       'text' => 'chap other node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-other-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -189,14 +195,6 @@ $result_trees{'double_index_entry'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-other-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -408,7 +406,7 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'elem
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 623c7fe067..876844742e 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -66,6 +66,12 @@ $result_trees{'index_entry_before_node'} = {
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -87,14 +93,6 @@ $result_trees{'index_entry_before_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -114,6 +112,12 @@ $result_trees{'index_entry_before_node'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -135,14 +139,6 @@ $result_trees{'index_entry_before_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -445,8 +441,8 @@ $result_trees{'index_entry_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
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 c83a2f8a66..a3addaa9b0 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
@@ -66,6 +66,12 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -87,14 +93,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -114,6 +112,12 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                       'text' => 'First'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'First'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -135,14 +139,6 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'First'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -477,8 +473,8 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
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 67f4935079..efa73101a0 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -101,6 +101,12 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -122,14 +128,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -149,6 +147,12 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'text' => 'First'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'First'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -170,14 +174,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'First'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -512,8 +508,8 @@ $result_trees{'index_entry_in_footnote_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 24dfd9d475..75371df7a3 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -251,6 +251,12 @@ $result_trees{'index_nodes'} = {
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -272,14 +278,6 @@ $result_trees{'index_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 15,
@@ -635,6 +633,12 @@ $result_trees{'index_nodes'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -656,14 +660,6 @@ $result_trees{'index_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 28,
@@ -796,6 +792,12 @@ $result_trees{'index_nodes'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -817,14 +819,6 @@ $result_trees{'index_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 33,
@@ -844,6 +838,12 @@ $result_trees{'index_nodes'} = {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -865,14 +865,6 @@ $result_trees{'index_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 34,
@@ -1480,7 +1472,7 @@ $result_trees{'index_nodes'} = {
 };
 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[1];
 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
@@ -1491,10 +1483,10 @@ 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_nod
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl 
b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
index 053e0b8392..38f70fbaf8 100644
--- a/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
+++ b/tp/t/results/indices/index_nodes_no_split_no_use_nodes.pl
@@ -251,6 +251,12 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -272,14 +278,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 15,
@@ -635,6 +633,12 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -656,14 +660,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 28,
@@ -796,6 +792,12 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -817,14 +819,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 33,
@@ -844,6 +838,12 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -865,14 +865,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_nodes.texi',
                 'line_nr' => 34,
@@ -1480,7 +1472,7 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
 };
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
@@ -1491,10 +1483,10 @@ 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[3]
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 3e11936ff5..316aa30681 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -1200,6 +1200,12 @@ $result_trees{'index_special_region'} = {
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1221,14 +1227,6 @@ $result_trees{'index_special_region'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 56,
@@ -1743,7 +1741,7 @@ 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[8]{'contents'}[
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl 
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index 88c9948349..f9a0de4ccf 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -1201,6 +1201,12 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1222,14 +1228,6 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 56,
@@ -1745,7 +1743,7 @@ 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index c711d6bd8d..ac0dbbd9eb 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -1201,6 +1201,12 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1222,14 +1228,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 56,
@@ -1745,7 +1743,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'co
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index 543aabe9dc..507ddc4da4 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -1201,6 +1201,12 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1222,14 +1228,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 56,
@@ -1745,7 +1743,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'conte
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index 3a60070a06..f9924e0474 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -1201,6 +1201,12 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1222,14 +1228,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region_no_insertcopying.texi',
                 'line_nr' => 56,
@@ -1745,7 +1743,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 65e6af1f10..ef51a0b2ae 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -1200,6 +1200,12 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1221,14 +1227,6 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 56,
@@ -1743,7 +1741,7 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'cont
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 864cd50665..8362171b6b 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -1200,6 +1200,12 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1221,14 +1227,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 56,
@@ -1743,7 +1741,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'content
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index e6ac8cad25..8d9a1a4628 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -1200,6 +1200,12 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                       'text' => 'Copying and indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-and-indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1221,14 +1227,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-and-indices'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_special_region.texi',
                 'line_nr' => 56,
@@ -1743,7 +1741,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'cont
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'args'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index 403373cd66..16b5754ae2 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -284,6 +284,12 @@ $result_trees{'index_split'} = {
                       'text' => 'Top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -305,14 +311,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 16,
@@ -332,6 +330,12 @@ $result_trees{'index_split'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -353,14 +357,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 17,
@@ -380,6 +376,12 @@ $result_trees{'index_split'} = {
                       'text' => 'second chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -401,14 +403,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 18,
@@ -972,6 +966,12 @@ $result_trees{'index_split'} = {
                       'text' => 'section 1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -993,14 +993,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 41,
@@ -1020,6 +1012,12 @@ $result_trees{'index_split'} = {
                       'text' => 'section 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1041,14 +1039,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 42,
@@ -1068,6 +1058,12 @@ $result_trees{'index_split'} = {
                       'text' => 'section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1089,14 +1085,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 43,
@@ -1116,6 +1104,12 @@ $result_trees{'index_split'} = {
                       'text' => 'node in section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1137,14 +1131,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 44,
@@ -1164,6 +1150,12 @@ $result_trees{'index_split'} = {
                       'text' => 'node 2 in section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-2-in-section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1185,14 +1177,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-2-in-section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 45,
@@ -1212,6 +1196,12 @@ $result_trees{'index_split'} = {
                       'text' => 'node 3 in section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-3-in-section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1233,14 +1223,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-3-in-section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 46,
@@ -1432,6 +1414,12 @@ $result_trees{'index_split'} = {
                       'text' => 'subsection 1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1453,14 +1441,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 55,
@@ -1480,6 +1460,12 @@ $result_trees{'index_split'} = {
                       'text' => 'subsection 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1501,14 +1487,6 @@ $result_trees{'index_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 56,
@@ -2798,9 +2776,9 @@ $result_trees{'index_split'} = {
 };
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
@@ -2817,16 +2795,16 @@ 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_nod
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[8];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
diff --git a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl 
b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
index b7232c4b4e..b427a55de2 100644
--- a/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/index_split_split_chapter_no_nodes.pl
@@ -284,6 +284,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'Top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -305,14 +311,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 16,
@@ -332,6 +330,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -353,14 +357,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 17,
@@ -380,6 +376,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'second chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -401,14 +403,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 18,
@@ -972,6 +966,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'section 1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -993,14 +993,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 41,
@@ -1020,6 +1012,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'section 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1041,14 +1039,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 42,
@@ -1068,6 +1058,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1089,14 +1085,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 43,
@@ -1116,6 +1104,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'node in section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1137,14 +1131,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 44,
@@ -1164,6 +1150,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'node 2 in section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-2-in-section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1185,14 +1177,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-2-in-section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 45,
@@ -1212,6 +1196,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'node 3 in section 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-3-in-section-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1233,14 +1223,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-3-in-section-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 46,
@@ -1432,6 +1414,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'subsection 1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1453,14 +1441,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 55,
@@ -1480,6 +1460,12 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                       'text' => 'subsection 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1501,14 +1487,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_split.texi',
                 'line_nr' => 56,
@@ -2798,9 +2776,9 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
 };
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
@@ -2817,16 +2795,16 @@ 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[8];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index 85c976880f..fd027f3811 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -108,6 +108,12 @@ $result_trees{'index_table'} = {
                       'text' => 'node with ftable and vtable'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-with-ftable-and-vtable'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -129,14 +135,6 @@ $result_trees{'index_table'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-with-ftable-and-vtable'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 6,
@@ -156,6 +154,12 @@ $result_trees{'index_table'} = {
                       'text' => 'node with printindex'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-with-printindex'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -177,14 +181,6 @@ $result_trees{'index_table'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-with-printindex'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 7,
@@ -204,6 +200,12 @@ $result_trees{'index_table'} = {
                       'text' => 'indices refs'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'indices-refs'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -225,14 +227,6 @@ $result_trees{'index_table'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'indices-refs'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 8,
@@ -1161,6 +1155,12 @@ $result_trees{'index_table'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1182,14 +1182,6 @@ $result_trees{'index_table'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 46,
@@ -6437,9 +6429,9 @@ $result_trees{'index_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
@@ -6456,7 +6448,7 @@ 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'cont
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = $result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'args'}[0];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[1];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl 
b/tp/t/results/indices/index_table_chapter_no_node.pl
index 5678945fd4..83d2c2667e 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -108,6 +108,12 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'text' => 'node with ftable and vtable'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-with-ftable-and-vtable'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -129,14 +135,6 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-with-ftable-and-vtable'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 6,
@@ -156,6 +154,12 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'text' => 'node with printindex'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-with-printindex'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -177,14 +181,6 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-with-printindex'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 7,
@@ -204,6 +200,12 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'text' => 'indices refs'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'indices-refs'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -225,14 +227,6 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'indices-refs'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 8,
@@ -1161,6 +1155,12 @@ $result_trees{'index_table_chapter_no_node'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1182,14 +1182,6 @@ $result_trees{'index_table_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'index_table.texi',
                 'line_nr' => 46,
@@ -6437,9 +6429,9 @@ $result_trees{'index_table_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
@@ -6456,7 +6448,7 @@ 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'con
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'args'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index c26227dc2a..3ab44b4ddf 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -231,6 +231,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -252,14 +258,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 11,
@@ -765,6 +763,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -786,14 +790,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 35,
@@ -1110,6 +1106,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1131,14 +1133,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 47,
@@ -1271,6 +1265,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1292,14 +1292,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 52,
@@ -1319,6 +1311,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1340,14 +1338,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 53,
@@ -1957,7 +1947,7 @@ 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'extra'}{'node_conte
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1];
@@ -1966,7 +1956,7 @@ 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
@@ -1975,10 +1965,10 @@ 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'extra'}{'elemen
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
diff --git a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
index ea867b5dca..dec5121e15 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter.pl
@@ -261,6 +261,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -282,14 +288,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 12,
@@ -901,6 +899,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -922,14 +926,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 42,
@@ -949,6 +945,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -970,14 +972,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 43,
@@ -997,6 +991,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
                       'text' => 'node in chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1018,14 +1018,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 44,
@@ -1339,6 +1331,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1360,14 +1358,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 56,
@@ -1500,6 +1490,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1521,14 +1517,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 61,
@@ -1548,6 +1536,12 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1569,14 +1563,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 62,
@@ -2445,7 +2431,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[1]
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1];
@@ -2456,9 +2442,9 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
@@ -2467,10 +2453,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
index 76ad28ed57..6150a29685 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
@@ -261,6 +261,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -282,14 +288,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 12,
@@ -901,6 +899,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -922,14 +926,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 42,
@@ -949,6 +945,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -970,14 +972,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 43,
@@ -997,6 +991,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'node in chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1018,14 +1018,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 44,
@@ -1339,6 +1331,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1360,14 +1358,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 56,
@@ -1500,6 +1490,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1521,14 +1517,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 61,
@@ -1548,6 +1536,12 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1569,14 +1563,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 62,
@@ -2445,7 +2431,7 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'a
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1];
@@ -2456,9 +2442,9 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'c
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
@@ -2467,10 +2453,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'c
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
diff --git 
a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
index 73cda3236c..523c63ee39 100644
--- a/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
@@ -261,6 +261,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -282,14 +288,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 12,
@@ -901,6 +899,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -922,14 +926,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 42,
@@ -949,6 +945,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -970,14 +972,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 43,
@@ -997,6 +991,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'node in chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1018,14 +1018,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 44,
@@ -1339,6 +1331,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1360,14 +1358,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 56,
@@ -1500,6 +1490,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1521,14 +1517,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 61,
@@ -1548,6 +1536,12 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1569,14 +1563,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top_and_sections.texi',
                 'line_nr' => 62,
@@ -2445,7 +2431,7 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1];
@@ -2456,9 +2442,9 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
@@ -2467,10 +2453,10 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter.pl
index cfb9468afa..8ef03a8c17 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -231,6 +231,12 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -252,14 +258,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 11,
@@ -765,6 +763,12 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -786,14 +790,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 35,
@@ -1110,6 +1106,12 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1131,14 +1133,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 47,
@@ -1271,6 +1265,12 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1292,14 +1292,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 52,
@@ -1319,6 +1311,12 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1340,14 +1338,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 53,
@@ -1957,7 +1947,7 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[1]{'extra
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1];
@@ -1966,7 +1956,7 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'e
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
@@ -1975,10 +1965,10 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2]{'e
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[3];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
diff --git a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl 
b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
index e958443e18..6689a48efc 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
@@ -231,6 +231,12 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -252,14 +258,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 11,
@@ -765,6 +763,12 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -786,14 +790,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = 
{
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 35,
@@ -1110,6 +1106,12 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1131,14 +1133,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 47,
@@ -1271,6 +1265,12 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1292,14 +1292,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 52,
@@ -1319,6 +1311,12 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                       'text' => 'another'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'another'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1340,14 +1338,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'another'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodes_before_top.texi',
                 'line_nr' => 53,
@@ -1957,7 +1947,7 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1];
@@ -1966,7 +1956,7 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'content
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
@@ -1975,10 +1965,10 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'content
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[3];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
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 cf3d36a0e3..e8249ffb05 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -657,6 +657,12 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -678,14 +684,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -894,7 +892,7 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying'} = '@copying
 
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 53df3ea10b..7f526b3882 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
@@ -321,6 +321,12 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -342,14 +348,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -507,7 +505,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
   'type' => 'document_root'
 };
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying_in_footnote'} = '@copying
 
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 5650e64e27..b01018ed3e 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
@@ -642,6 +642,12 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -663,14 +669,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -864,7 +862,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying_no_insertcopying'} = '@copying
 
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index dbfaedc325..143507877c 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -214,6 +214,12 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -235,14 +241,6 @@ $result_trees{'split_chapter_index'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 13,
@@ -765,6 +763,12 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'section 1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -786,14 +790,6 @@ $result_trees{'split_chapter_index'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 34,
@@ -940,6 +936,12 @@ $result_trees{'split_chapter_index'} = {
                       'text' => 'subsection 1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -961,14 +963,6 @@ $result_trees{'split_chapter_index'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'split_chapter_index.texi',
                 'line_nr' => 41,
@@ -1263,7 +1257,7 @@ $result_trees{'split_chapter_index'} = {
 };
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
@@ -1280,8 +1274,8 @@ 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'extra'}{'el
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[13];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
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 984009a326..bca4e2ab0f 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -215,6 +215,12 @@ $result_trees{'before_node_and_section'} = {
                       'text' => 'node1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -236,14 +242,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -435,6 +433,12 @@ $result_trees{'before_node_and_section'} = {
                       'text' => 'node1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -456,14 +460,6 @@ $result_trees{'before_node_and_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -642,11 +638,11 @@ $result_trees{'before_node_and_section'} = {
 };
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[1];
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'before_node_and_section'}{'contents'}[1] = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'extra'}{'label'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'before_node_and_section'} = 'Garbage
 ref to Top @ref{Top}.
diff --git a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
index 9730791288..2e4ff05e36 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
@@ -97,6 +97,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'text' => ' with entries.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'One_003a_003anode_002c-with-entries_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -118,18 +128,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'One_003a_003anode_002c-with-entries_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -149,6 +147,12 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                       'text' => 'Concept Index'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Concept-Index'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -170,14 +174,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Concept-Index'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -727,12 +723,12 @@ $result_trees{'colons_in_index_entries_and_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
diff --git 
a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
index 57a8746e95..1086431466 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
@@ -97,6 +97,16 @@ $result_trees{'colons_in_index_entries_and_node_no_quoting'} 
= {
                       'text' => ' with entries.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'One_003a_003anode_002c-with-entries_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -118,18 +128,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'One_003a_003anode_002c-with-entries_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -149,6 +147,12 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                       'text' => 'Concept Index'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Concept-Index'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -170,14 +174,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Concept-Index'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -727,12 +723,12 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
diff --git a/tp/t/results/info_tests/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
index 807714add5..10fc6f7fb6 100644
--- a/tp/t/results/info_tests/direntry_dircategory.pl
+++ b/tp/t/results/info_tests/direntry_dircategory.pl
@@ -162,6 +162,11 @@ $result_trees{'direntry_dircategory'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -204,13 +209,6 @@ $result_trees{'direntry_dircategory'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
                     'line_nr' => 7,
@@ -321,6 +319,13 @@ $result_trees{'direntry_dircategory'} = {
                           'type' => 'space_at_end_menu_node'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {},
+                          {}
+                        ],
+                        'normalized' => 'aaa'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -346,15 +351,6 @@ $result_trees{'direntry_dircategory'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {},
-                        {}
-                      ],
-                      'normalized' => 'aaa'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => 'direntry_dircategory.texi',
                     'line_nr' => 12,
@@ -574,6 +570,11 @@ $result_trees{'direntry_dircategory'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -595,13 +596,6 @@ $result_trees{'direntry_dircategory'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
                 'line_nr' => 25,
@@ -679,6 +673,12 @@ $result_trees{'direntry_dircategory'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -700,14 +700,6 @@ $result_trees{'direntry_dircategory'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'direntry_dircategory.texi',
                 'line_nr' => 29,
@@ -868,11 +860,11 @@ $result_trees{'direntry_dircategory'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'direntry_dircategory'} = '\\input texinfo @c -*-texinfo-*-
 
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 e597c5ee5b..4604115804 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -103,6 +103,11 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -145,13 +150,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -262,6 +260,13 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'aaa'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -287,15 +292,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'aaa'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -455,9 +451,9 @@ $result_trees{'direntry_dircategory_and_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'direntry_dircategory_and_commands'} = '@dircategory 
``category---@var{th  ere}?\'\'
 @direntry
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index a7683d2bc4..d6d09f3c06 100644
--- a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -581,6 +581,16 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                       'text' => ' After punct'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-f-nl-Something_003f-After-punct'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -602,18 +612,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-f-nl-Something_003f-After-punct'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -639,6 +637,14 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                       'text' => ' p'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'ankh-p'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -660,16 +666,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'ankh-p'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -713,6 +709,14 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                       'text' => ' p'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'ankh-p'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -734,16 +738,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'ankh-p'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -781,6 +775,12 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                       'text' => 'ankh p'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'ankh-p'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -802,14 +802,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'ankh-p'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -888,18 +880,18 @@ 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[3]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'end_of_line_command_in_node_lines'} = '@node Top
 @top top
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 af55e8808c..0966a2875b 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
@@ -97,6 +97,12 @@ $result_trees{'index_entry_at_end_node'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -118,14 +124,6 @@ $result_trees{'index_entry_at_end_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -145,6 +143,12 @@ $result_trees{'index_entry_at_end_node'} = {
                       'text' => 'indices'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'indices'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -166,14 +170,6 @@ $result_trees{'index_entry_at_end_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'indices'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -468,8 +464,8 @@ $result_trees{'index_entry_at_end_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[3];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3];
 
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 f305c42c75..9806497900 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
@@ -114,18 +114,16 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'nodename_002e-a'
+                  },
                   'type' => 'menu_entry_node'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'nodename_002e-a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -173,6 +171,14 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       'text' => 'comma'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'node_002ccomma'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -194,16 +200,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'node_002ccomma'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -238,6 +234,12 @@ $result_trees{'invalid_node_name_no_warning'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'bidule_003a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -259,14 +261,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'bidule_003a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -685,12 +679,12 @@ $result_trees{'invalid_node_name_no_warning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'invalid_node_name_no_warning'}{'contents'}[2];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'invalid_node_name_no_warning'}{'contents'}[3];
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 2b87224b12..2f3d46aba7 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -114,18 +114,16 @@ $result_trees{'invalid_node_name_warning'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'nodename_002e-a'
+                  },
                   'type' => 'menu_entry_node'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'nodename_002e-a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -173,6 +171,14 @@ $result_trees{'invalid_node_name_warning'} = {
                       'text' => 'comma'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'node_002ccomma'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -194,16 +200,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'node_002ccomma'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -238,6 +234,12 @@ $result_trees{'invalid_node_name_warning'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'bidule_003a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -259,14 +261,6 @@ $result_trees{'invalid_node_name_warning'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'bidule_003a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -685,12 +679,12 @@ $result_trees{'invalid_node_name_warning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'invalid_node_name_warning'}{'contents'}[2];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'invalid_node_name_warning'}{'contents'}[3];
diff --git a/tp/t/results/info_tests/one_node_counted_elements.pl 
b/tp/t/results/info_tests/one_node_counted_elements.pl
index 5bd3a653c7..eb87faa277 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -231,6 +231,11 @@ $result_trees{'one_node_counted_elements'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -252,13 +257,6 @@ $result_trees{'one_node_counted_elements'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -430,7 +428,7 @@ 
$result_trees{'one_node_counted_elements'}{'contents'}[0]{'contents'}[1]{'extra'
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/info_tests/quote_node_names_info.pl 
b/tp/t/results/info_tests/quote_node_names_info.pl
index c889bf7279..ee593275c7 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -1332,6 +1332,14 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'blah'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'blah_003ablah'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1353,16 +1361,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'blah_003ablah'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 34,
@@ -1415,6 +1413,14 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'fump'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'blumpty_002efump'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1436,16 +1442,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'blumpty_002efump'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 35,
@@ -1465,6 +1461,12 @@ $result_trees{'quote_node_names_info'} = {
                       'text' => 'normal node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'normal-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1486,14 +1488,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'normal-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 36,
@@ -1561,6 +1555,12 @@ $result_trees{'quote_node_names_info'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'secret_002cnode'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1582,14 +1582,6 @@ $result_trees{'quote_node_names_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'secret_002cnode'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 37,
@@ -1626,21 +1618,19 @@ $result_trees{'quote_node_names_info'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'u_002eal_0029ext_003a_003a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'u_002eal_0029ext_003a_003a'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 38,
@@ -1978,16 +1968,16 @@ 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[19]{'contents'
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[2];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[2];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[1];
 $result_trees{'quote_node_names_info'}{'contents'}[3] = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'quote_node_names_info'}{'contents'}[5] = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'quote_node_names_info'}{'contents'}[7] = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
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 1c26f62bfd..6cc108e11f 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -66,6 +66,11 @@ $result_trees{'space_at_menu_end'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -87,13 +92,6 @@ $result_trees{'space_at_menu_end'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -187,7 +185,7 @@ $result_trees{'space_at_menu_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'space_at_menu_end'} = '@node Top
 
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index 37a05a4c7d..a99347641f 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -106,6 +106,12 @@ $result_trees{'space_in_menu'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -127,14 +133,6 @@ $result_trees{'space_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -280,7 +278,7 @@ $result_trees{'space_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'space_in_menu'} = '@node Top
 @top Element
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index b509dcad5b..0feb687b21 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -154,6 +154,12 @@ $result_trees{'split_no_copying'} = {
                       'text' => 'Ch1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Ch1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -175,14 +181,6 @@ $result_trees{'split_no_copying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Ch1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -353,7 +351,7 @@ $result_trees{'split_no_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_no_copying'} = '\\input texinfo
 @setfilename split_no_copying.info
diff --git a/tp/t/results/info_tests/split_nocopying.pl 
b/tp/t/results/info_tests/split_nocopying.pl
index 0df20dd51f..f0898cda33 100644
--- a/tp/t/results/info_tests/split_nocopying.pl
+++ b/tp/t/results/info_tests/split_nocopying.pl
@@ -133,6 +133,12 @@ $result_trees{'split_nocopying'} = {
                       'text' => 'Ch1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Ch1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -154,14 +160,6 @@ $result_trees{'split_nocopying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Ch1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
                 'line_nr' => 9,
@@ -322,7 +320,7 @@ $result_trees{'split_nocopying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_nocopying'} = '\\input texinfo
 
diff --git a/tp/t/results/info_tests/split_nocopying_split.pl 
b/tp/t/results/info_tests/split_nocopying_split.pl
index fb12ee215d..26831f1ec6 100644
--- a/tp/t/results/info_tests/split_nocopying_split.pl
+++ b/tp/t/results/info_tests/split_nocopying_split.pl
@@ -133,6 +133,12 @@ $result_trees{'split_nocopying_split'} = {
                       'text' => 'Ch1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Ch1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -154,14 +160,6 @@ $result_trees{'split_nocopying_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Ch1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'split_nocopying.texi',
                 'line_nr' => 9,
@@ -322,7 +320,7 @@ $result_trees{'split_nocopying_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_nocopying_split'} = '\\input texinfo
 
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 32ca779568..c232818532 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
@@ -159,6 +159,12 @@ $result_trees{'split_test_before_first_node'} = {
                       'text' => 'chap1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -180,14 +186,6 @@ $result_trees{'split_test_before_first_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -338,7 +336,7 @@ $result_trees{'split_test_before_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_test_before_first_node'} = '@setfilename 
split_test_before_first_node.info
 
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 fafeeff6e8..ee4e46d689 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
@@ -154,6 +154,12 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
                       'text' => 'chap1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -175,14 +181,6 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -333,7 +331,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_test_before_first_node_no_empty_line'} = '@setfilename 
split_test_before_first_node_no_empty_line.info
 
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index fa2500890f..3069b313e8 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -820,6 +820,12 @@ $result_trees{'test_index'} = {
                       'text' => 'name'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'name'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -841,14 +847,6 @@ $result_trees{'test_index'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'name'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -868,6 +866,12 @@ $result_trees{'test_index'} = {
                       'text' => 'name1 
looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -889,14 +893,6 @@ $result_trees{'test_index'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 28,
@@ -2954,8 +2950,8 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'conte
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index ef1a239471..7006e5d96a 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -92,6 +92,12 @@ $result_trees{'text_before_node'} = {
                       'text' => 'chapter node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'text_before_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -253,7 +251,7 @@ $result_trees{'text_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'text_before_node'} = '@node Top
 @top top
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index eec0b8049a..e2bfe841cc 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -131,6 +131,12 @@ $result_trees{'top_node_normalization'} = {
                       'text' => 'tOP'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -152,14 +158,6 @@ $result_trees{'top_node_normalization'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Top'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -228,7 +226,7 @@ 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'top_node_normalization'}{'contents'}[1];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_normalization'} = '@node ToP
 
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index a8154face2..5b50bf556b 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -41,6 +41,11 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -163,13 +168,6 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -222,11 +220,11 @@ $result_trees{'def_not_closed_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'def_not_closed_in_menu_description'} = '@menu
 * (info):: before deff @deffn bidule truc chose
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 caa06e1310..61c2c16d63 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -90,6 +90,11 @@ $result_trees{'menu_in_style_command'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -111,13 +116,6 @@ $result_trees{'menu_in_style_command'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -182,7 +180,7 @@ $result_trees{'menu_in_style_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_in_style_command'} = '@node first
 
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 13ac08582a..644986209d 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
@@ -92,6 +92,12 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = 
{
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -315,7 +313,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'style_not_closed_no_newline_root_commands'} = '@node Top
 @top top
diff --git a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 2e6b584e3d..e3137616e2 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
@@ -92,6 +92,12 @@ $result_trees{'style_not_closed_root_commands'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'style_not_closed_root_commands'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -325,7 +323,7 @@ $result_trees{'style_not_closed_root_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'style_not_closed_root_commands'} = '@node Top
 @top top
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index d4fd20244d..23707a20fc 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -41,6 +41,11 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -62,13 +67,6 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -233,7 +231,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'table_not_closed_in_menu_comment'} = '@menu
diff --git 
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index 1208ad51a5..1d295bb8c1 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -41,6 +41,11 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -154,13 +159,6 @@ $result_trees{'table_not_closed_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -213,8 +211,8 @@ $result_trees{'table_not_closed_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'table_not_closed_in_menu_description'} = '@menu
 * (gcc):: text @table @asis
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 9febe23f45..a320220e43 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -328,6 +328,12 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'chapter ja'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-ja'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -349,14 +355,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-ja'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -376,6 +374,12 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'chapter en'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-en'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -397,14 +401,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-en'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -424,6 +420,12 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'chapter fr_FR'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-fr_005fFR'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -445,14 +447,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-fr_005fFR'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -472,6 +466,12 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'chapter de'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-de'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -493,14 +493,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-de'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -520,6 +512,12 @@ $result_trees{'multiple_lang_chapters'} = {
                       'text' => 'chapter pt_BR'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-pt_005fBR'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -541,14 +539,6 @@ $result_trees{'multiple_lang_chapters'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-pt_005fBR'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -1727,11 +1717,11 @@ $result_trees{'multiple_lang_chapters'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 073d346295..2bef2a0480 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -328,6 +328,12 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'chapter ja'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-ja'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -349,14 +355,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-ja'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -376,6 +374,12 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'chapter en'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-en'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -397,14 +401,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-en'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -424,6 +420,12 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'chapter fr_FR'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-fr_005fFR'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -445,14 +447,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-fr_005fFR'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -472,6 +466,12 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'chapter de'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-de'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -493,14 +493,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-de'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -520,6 +512,12 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'text' => 'chapter pt_BR'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-pt_005fBR'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -541,14 +539,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-pt_005fBR'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -1727,11 +1717,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 5b39b59138..c7e03165ec 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -295,6 +295,12 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'chapter ja'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-ja'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -316,14 +322,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-ja'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -343,6 +341,12 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'chapter en'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-en'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -364,14 +368,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-en'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -391,6 +387,12 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'chapter fr_FR'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-fr_005fFR'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -412,14 +414,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-fr_005fFR'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -439,6 +433,12 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'chapter de'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-de'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -460,14 +460,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-de'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -487,6 +479,12 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'text' => 'chapter pt_BR'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-pt_005fBR'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -508,14 +506,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-pt_005fBR'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -1694,11 +1684,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
diff --git a/tp/t/results/latex_tests/custom_heading_with_include.pl 
b/tp/t/results/latex_tests/custom_heading_with_include.pl
index 3683f670a9..996cd6588d 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -545,6 +545,12 @@ $result_trees{'custom_heading_with_include'} = {
                       'text' => 'Section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -566,14 +572,6 @@ $result_trees{'custom_heading_with_include'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 16,
@@ -720,6 +718,12 @@ $result_trees{'custom_heading_with_include'} = {
                       'text' => 'Subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -741,14 +745,6 @@ $result_trees{'custom_heading_with_include'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 23,
@@ -2148,8 +2144,8 @@ $result_trees{'custom_heading_with_include'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'custom_heading_with_include'} = '@setchapternewpage odd
 @everyheading @thispage @| @thisfile @| @thischapter
diff --git a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl 
b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
index 13062f30b8..ee23bf4a61 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
@@ -560,6 +560,12 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                       'text' => 'Section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -581,14 +587,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 16,
@@ -735,6 +733,12 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                       'text' => 'Subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -756,14 +760,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 23,
@@ -2163,8 +2159,8 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'custom_heading_with_include_in_command'} = '@setchapternewpage 
odd
 @everyheading @thischapter @emph{@thisfile} @| @| @thispage
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 5f1cccaf0d..4ee1080364 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 9b6ec376e4..75145c3fed 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_chapter'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 56532a98fa..f802269c9b 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_chapter_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_chapter_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_chapter_no_header'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_chapter_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_chapter_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter_no_header'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 f479d61f06..f36def7764 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index 9047583697..64746e8968 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_chapter_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_chapter_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_chapter_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_chapter_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_chapter_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 9c32527ef0..ee416dceee 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_no_header'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_no_header'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 55ff961ef4..38f4db2197 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_no_header_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index ac947386df..480fc86457 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_node'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_node'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_node'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index ff50148c6d..4450524d1c 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_node_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_node_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_node_no_header'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_node_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_node_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node_no_header'} = '\\input texinfo @c -*-texinfo-*-
 
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 589016dbff..f5811870f0 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_node_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index f11f79f733..1223797849 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_node_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_node_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_node_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_node_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_node_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node_vertical'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index cfdb6c13b7..aae01af625 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_section'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_section'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_section'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_section'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index f08120e527..1a33c2a604 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_section_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_section_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_section_no_header'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_section_no_header'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_section_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section_no_header'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 1da03bd465..62787a7421 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_section_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index b87e11e349..7cb6315852 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_section_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_section_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_section_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_section_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_section_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_test_misc_file_collision.pl 
b/tp/t/results/layout/navigation_test_misc_file_collision.pl
index 660c0d6746..886f0891bc 100644
--- a/tp/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_test_misc_file_collision'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_test_misc_file_collision'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index ec90249bec..68c174ed3a 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -113,6 +113,12 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'navigation_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 7,
@@ -288,6 +286,12 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -309,14 +313,6 @@ $result_trees{'navigation_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 14,
@@ -649,6 +645,12 @@ $result_trees{'navigation_vertical'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -670,14 +672,6 @@ $result_trees{'navigation_vertical'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'navigation.texi',
                 'line_nr' => 48,
@@ -844,9 +838,9 @@ $result_trees{'navigation_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_vertical'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index f5814b412e..069ec0ae55 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -197,6 +197,12 @@ $result_trees{'no_monolithic'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -218,14 +224,6 @@ $result_trees{'no_monolithic'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
                 'line_nr' => 11,
@@ -458,7 +456,7 @@ $result_trees{'no_monolithic'} = {
 };
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3];
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_monolithic'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl 
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
index 7066ce2f62..6ef2ce45ec 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -197,6 +197,12 @@ $result_trees{'no_monolithic_only_toc_out'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -218,14 +224,6 @@ $result_trees{'no_monolithic_only_toc_out'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_monolithic.texi',
                 'line_nr' => 11,
@@ -458,7 +456,7 @@ $result_trees{'no_monolithic_only_toc_out'} = {
 };
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[1];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3];
-$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 28282614ce..03b54ed74c 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -3691,6 +3691,12 @@ $result_trees{'bib_example'} = {
                       'text' => 'Introduction'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Introduction'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3712,14 +3718,6 @@ $result_trees{'bib_example'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Introduction'
-                }
-              },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
                 'line_nr' => 34,
@@ -3783,6 +3781,12 @@ $result_trees{'bib_example'} = {
                       'text' => 'References'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'References'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3804,14 +3808,6 @@ $result_trees{'bib_example'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'References'
-                }
-              },
               'source_info' => {
                 'file_name' => 'bib-example.texi',
                 'line_nr' => 35,
@@ -4927,8 +4923,8 @@ $result_trees{'bib_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1];
 $result_trees{'bib_example'}{'contents'}[5] = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'};
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index fc158dc2f3..7ba57edc9c 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -444,6 +444,12 @@ $result_trees{'glossary'} = {
                       'text' => 'glossary'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'glossary'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -465,14 +471,6 @@ $result_trees{'glossary'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'glossary'
-                }
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 39,
@@ -1613,7 +1611,7 @@ $result_trees{'glossary'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
 $result_trees{'glossary'}{'contents'}[4]{'contents'}[2]{'contents'}[1] = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'extra'}{'label'};
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl 
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index 9a2046d78b..5d00dfab26 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -151,6 +151,12 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
                       'text' => 'name.after'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'name_002eafter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -180,14 +186,6 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'name_002eafter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -240,7 +238,7 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_for_dot_in_menu_not_separator'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_for_dot_in_menu_not_separator'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'macro_for_dot_in_menu_not_separator'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_for_dot_in_menu_not_separator'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'macro_for_dot_in_menu_not_separator'} = '@macro macrodot
 .
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl 
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index 359c681c36..db01747d08 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -122,6 +122,12 @@ $result_trees{'macro_in_empty_menu_comment'} = {
                       'text' => 'Copying Conditions'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-Conditions'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -143,14 +149,6 @@ $result_trees{'macro_in_empty_menu_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-Conditions'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -203,7 +201,7 @@ $result_trees{'macro_in_empty_menu_comment'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_empty_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_empty_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_empty_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_empty_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'macro_in_empty_menu_comment'} = '@macro emptystring
 
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index a5e0dd19e0..b1046479f0 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -456,6 +456,12 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'menu entry'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'menu-entry'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -485,14 +491,6 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'menu-entry'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -582,6 +580,12 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -622,14 +626,6 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -681,6 +677,12 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'other node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -702,14 +704,6 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -748,6 +742,12 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'node colon macro'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-colon-macro'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -823,14 +823,6 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-colon-macro'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 32,
@@ -862,6 +854,12 @@ $result_trees{'macro_in_menu'} = {
                       'text' => 'entry'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'entry'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -908,14 +906,6 @@ $result_trees{'macro_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'entry'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -968,11 +958,11 @@ $result_trees{'macro_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[6]{'contents'}[3]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[6]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[13]{'contents'}[6]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'macro_in_menu'} = '
 @macro astar
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl 
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index 367df86e4c..8ecc5f744b 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -136,6 +136,12 @@ 
$result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = {
                           'text' => 'second'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'second'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -157,14 +163,6 @@ 
$result_trees{'macro_in_menu_comment_closed_by_detailmenu'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'second'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 7,
@@ -256,7 +254,7 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_menu_comment_closed_by_detailmenu'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu_comment_closed_by_detailmenu'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu_comment_closed_by_detailmenu'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu_comment_closed_by_detailmenu'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'macro_in_menu_comment_closed_by_detailmenu'} = '@macro 
emptystring
 
diff --git a/tp/t/results/macro/macro_in_menu_description.pl 
b/tp/t/results/macro/macro_in_menu_description.pl
index 48f8caf4ab..dc75e8eb74 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -97,6 +97,12 @@ $result_trees{'macro_in_menu_description'} = {
                       'text' => 'Copying Conditions'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-Conditions'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -118,14 +124,6 @@ $result_trees{'macro_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-Conditions'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -216,7 +214,7 @@ $result_trees{'macro_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_menu_description'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu_description'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu_description'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu_description'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'macro_in_menu_description'} = '@macro emptystring
 
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 317552390b..e3e648f4c2 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -4898,6 +4898,12 @@ $result_trees{'macro_in_misc_commands'} = {
                       'text' => 'node atext'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-atext'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4919,14 +4925,6 @@ $result_trees{'macro_in_misc_commands'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-atext'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 200,
@@ -5331,7 +5329,7 @@ $result_trees{'macro_in_misc_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'macro_in_misc_commands'} = '@macro text 
 atext
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 30f80ce620..f59ed7157e 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -98,6 +98,11 @@ $result_trees{'block_commands_in_menu_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -512,13 +517,6 @@ $result_trees{'block_commands_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -581,9 +579,9 @@ $result_trees{'block_commands_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'block_commands_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index fb8c0b0f4a..6217e63989 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -72,6 +72,12 @@ $result_trees{'comment_on_menu_line'} = {
                       'text' => 'first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -93,14 +99,6 @@ $result_trees{'comment_on_menu_line'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -237,7 +235,7 @@ $result_trees{'comment_on_menu_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'comment_on_menu_line'} = '@node Top
 
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index 0d81a69bcf..9a0b6e4655 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -61,6 +61,15 @@ $result_trees{'dash_in_menu'} = {
                       'text' => 'n---ode'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'n_002d_002d_002dode'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -82,17 +91,6 @@ $result_trees{'dash_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'n_002d_002d_002dode'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -164,8 +162,8 @@ $result_trees{'dash_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'dash_in_menu'} = '
 @menu
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index 094cb4501a..c81e79896f 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -40,6 +40,12 @@ $result_trees{'detailmenu'} = {
                       'text' => 'Copying Conditions'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-Conditions'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -61,14 +67,6 @@ $result_trees{'detailmenu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-Conditions'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -117,6 +115,12 @@ $result_trees{'detailmenu'} = {
                           'text' => 'detailmenu'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'detailmenu'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -138,14 +142,6 @@ $result_trees{'detailmenu'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'detailmenu'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 6,
@@ -237,8 +233,8 @@ $result_trees{'detailmenu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'detailmenu'} = '
 @menu
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index 43c72d5759..b1523190b4 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -40,6 +40,12 @@ $result_trees{'detailmenu_in_description'} = {
                       'text' => 'Copying Conditions'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Copying-Conditions'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -61,14 +67,6 @@ $result_trees{'detailmenu_in_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Copying-Conditions'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -102,6 +100,12 @@ $result_trees{'detailmenu_in_description'} = {
                           'text' => 'detailmenu'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'detailmenu'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -123,14 +127,6 @@ $result_trees{'detailmenu_in_description'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'detailmenu'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -222,8 +218,8 @@ $result_trees{'detailmenu_in_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'detailmenu_in_description'} = '
 @menu
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 89f7db1812..59adc93ccc 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -92,6 +92,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -140,6 +138,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'chapter 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -161,14 +165,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -217,6 +213,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                           'text' => 'section'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'section'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -238,14 +240,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'section'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 9,
@@ -352,6 +346,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                           'text' => 'section chap 2'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'section-chap-2'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -373,14 +373,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'section-chap-2'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -400,6 +392,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                           'text' => 'unnumberedsec'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'unnumberedsec'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -421,14 +419,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'unnumberedsec'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 16,
@@ -614,6 +604,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -635,14 +631,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -858,6 +846,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'section chap 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-chap-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -879,14 +873,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-chap-2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 34,
@@ -906,6 +892,12 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'text' => 'unnumberedsec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -927,14 +919,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -1133,14 +1117,14 @@ $result_trees{'detailmenu_on_subnodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'detailmenu_on_subnodes'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 2c8afad290..73a54e1d9b 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -74,6 +74,12 @@ $result_trees{'detailmenu_unknown_node'} = {
                           'text' => 'unknown'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'unknown'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -95,14 +101,6 @@ $result_trees{'detailmenu_unknown_node'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'unknown'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -206,7 +204,7 @@ $result_trees{'detailmenu_unknown_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'detailmenu_unknown_node'} = '@node 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 22f7d4b9d4..23b232c954 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -139,6 +139,11 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -160,13 +165,6 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -229,7 +227,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'direntry_dircategory_after_first_node'} = '@node Top
 @top direntry direcategory after first node
diff --git a/tp/t/results/menu/empty_menu_description.pl 
b/tp/t/results/menu/empty_menu_description.pl
index 6da607b4d1..5ed001122c 100644
--- a/tp/t/results/menu/empty_menu_description.pl
+++ b/tp/t/results/menu/empty_menu_description.pl
@@ -86,24 +86,22 @@ $result_trees{'empty_menu_description'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -183,9 +181,9 @@ $result_trees{'empty_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3];
-$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[4];
+$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[4];
 
 $result_texis{'empty_menu_description'} = '@node first
 
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index 03d989268a..ba365279cf 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -73,6 +73,11 @@ $result_trees{'empty_menu_entry_name'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -94,13 +99,6 @@ $result_trees{'empty_menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -127,6 +125,12 @@ $result_trees{'empty_menu_entry_name'} = {
                       'text' => 'aaa'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'aaa'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +152,6 @@ $result_trees{'empty_menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'aaa'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -257,8 +253,8 @@ $result_trees{'empty_menu_entry_name'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'empty_menu_entry_name'} = '@node first
 
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 067c63c126..7842b83da8 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -74,6 +74,12 @@ $result_trees{'entry_after_detailmenu'} = {
                           'text' => 'second'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'second'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -95,14 +101,6 @@ $result_trees{'entry_after_detailmenu'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'second'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -185,6 +183,12 @@ $result_trees{'entry_after_detailmenu'} = {
                       'text' => 'chap first'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -206,14 +210,6 @@ $result_trees{'entry_after_detailmenu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -262,6 +258,12 @@ $result_trees{'entry_after_detailmenu'} = {
                           'text' => 'second'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'second'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -283,14 +285,6 @@ $result_trees{'entry_after_detailmenu'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'second'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 13,
@@ -349,6 +343,12 @@ $result_trees{'entry_after_detailmenu'} = {
                       'text' => 'second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -370,14 +370,6 @@ $result_trees{'entry_after_detailmenu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -511,10 +503,10 @@ $result_trees{'entry_after_detailmenu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'entry_after_detailmenu'} = '@node Top
 
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index b31f4413fd..564b715c84 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -35,6 +35,12 @@ $result_trees{'example_in_menu_comment'} = {
                       'text' => 'entry'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'entry'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -56,14 +62,6 @@ $result_trees{'example_in_menu_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'entry'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -221,7 +219,7 @@ $result_trees{'example_in_menu_comment'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'example_in_menu_comment'} = '@menu
 * entry::
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 67d7e54792..45e306eef8 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -98,6 +98,11 @@ $result_trees{'example_in_menu_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -190,13 +195,6 @@ $result_trees{'example_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -274,7 +272,7 @@ $result_trees{'example_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'example_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index d7cedea2af..8280d39ff3 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -66,6 +66,11 @@ $result_trees{'formats_in_menu'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -212,13 +217,6 @@ $result_trees{'formats_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -259,6 +257,11 @@ $result_trees{'formats_in_menu'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -343,13 +346,6 @@ $result_trees{'formats_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -375,6 +371,11 @@ $result_trees{'formats_in_menu'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -467,13 +468,6 @@ $result_trees{'formats_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -499,6 +493,11 @@ $result_trees{'formats_in_menu'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -542,13 +541,6 @@ $result_trees{'formats_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -704,11 +696,11 @@ $result_trees{'formats_in_menu'} = {
   ],
   'type' => 'document_root'
 };
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'formats_in_menu'} = '@node first
 
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index f1df9e0be3..43ba37979b 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -98,6 +98,11 @@ $result_trees{'inlineraw_in_menu_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -167,13 +172,6 @@ $result_trees{'inlineraw_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -251,7 +249,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'inlineraw_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index b6351e2332..e97bad1bff 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -84,6 +84,15 @@ $result_trees{'invalid_info_menu_entry'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a_003a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -105,17 +114,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a_003a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -171,6 +169,15 @@ $result_trees{'invalid_info_menu_entry'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -192,17 +199,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -258,6 +254,15 @@ $result_trees{'invalid_info_menu_entry'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node_002e-'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -279,17 +284,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node_002e-'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -345,6 +339,15 @@ $result_trees{'invalid_info_menu_entry'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node_002cn'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -366,17 +369,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node_002cn'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -432,6 +424,15 @@ $result_trees{'invalid_info_menu_entry'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-n'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -453,17 +454,6 @@ $result_trees{'invalid_info_menu_entry'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-n'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -528,16 +518,16 @@ $result_trees{'invalid_info_menu_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'invalid_info_menu_entry'} = '@node first
 
diff --git a/tp/t/results/menu/menu_entry_name.pl 
b/tp/t/results/menu/menu_entry_name.pl
index 7df4c7c194..4d35af122c 100644
--- a/tp/t/results/menu/menu_entry_name.pl
+++ b/tp/t/results/menu/menu_entry_name.pl
@@ -61,21 +61,19 @@ $result_trees{'menu_entry_name'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'b'
+                  },
                   'type' => 'menu_entry_node'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -116,6 +114,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b1.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b1_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -137,17 +144,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b1_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -188,6 +184,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b2.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b2_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -209,17 +214,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b2_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -260,6 +254,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b3.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b3_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -281,17 +284,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b3_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -332,6 +324,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b1.'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b1_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -353,17 +354,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b1_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -407,6 +397,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b2 .'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b2-_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -428,17 +427,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b2-_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -479,6 +467,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b3.'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b3_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -500,17 +497,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b3_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -551,6 +537,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b1.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b1_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -572,17 +567,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b1_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -623,6 +607,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b2.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b2_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -644,17 +637,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b2_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -695,6 +677,15 @@ $result_trees{'menu_entry_name'} = {
                       'text' => 'b3.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b3_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -716,17 +707,6 @@ $result_trees{'menu_entry_name'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b3_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -779,27 +759,27 @@ $result_trees{'menu_entry_name'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[4];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'contents'}[4];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[4];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[3]{'contents'}[4];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'menu_entry_name'} = '@menu
 * a: (f)b
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index 2df311865e..fe52481736 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -56,6 +56,15 @@ $result_trees{'menu_entry_name_comment'} = {
                       'text' => 'b'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -85,17 +94,6 @@ $result_trees{'menu_entry_name_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -140,6 +138,16 @@ $result_trees{'menu_entry_name_comment'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -169,18 +177,6 @@ $result_trees{'menu_entry_name_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -221,6 +217,15 @@ $result_trees{'menu_entry_name_comment'} = {
                       'text' => 'b1c.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b1c_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -254,17 +259,6 @@ $result_trees{'menu_entry_name_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b1c_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -305,6 +299,15 @@ $result_trees{'menu_entry_name_comment'} = {
                       'text' => 'b2c.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b2c_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -338,17 +341,6 @@ $result_trees{'menu_entry_name_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b2c_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -389,6 +381,15 @@ $result_trees{'menu_entry_name_comment'} = {
                       'text' => 'b3c.c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b3c_002ec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -425,17 +426,6 @@ $result_trees{'menu_entry_name_comment'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b3c_002ec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -488,17 +478,17 @@ $result_trees{'menu_entry_name_comment'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[4];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[4];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'menu_entry_name_comment'} = '@menu
 * a: (f)b@c c
diff --git a/tp/t/results/menu/menu_entry_no_entry_location.pl 
b/tp/t/results/menu/menu_entry_no_entry_location.pl
index 24fbbc3b6f..045d0541da 100644
--- a/tp/t/results/menu/menu_entry_no_entry_location.pl
+++ b/tp/t/results/menu/menu_entry_no_entry_location.pl
@@ -41,6 +41,11 @@ $result_trees{'menu_entry_no_entry_location'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -66,13 +71,6 @@ $result_trees{'menu_entry_no_entry_location'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -98,6 +96,11 @@ $result_trees{'menu_entry_no_entry_location'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -131,13 +134,6 @@ $result_trees{'menu_entry_no_entry_location'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -163,6 +159,11 @@ $result_trees{'menu_entry_no_entry_location'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -184,13 +185,6 @@ $result_trees{'menu_entry_no_entry_location'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -243,9 +237,9 @@ $result_trees{'menu_entry_no_entry_location'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_entry_no_entry_location'} = '@menu
 * (manual):: begin description
diff --git a/tp/t/results/menu/menu_entry_node.pl 
b/tp/t/results/menu/menu_entry_node.pl
index 095605814e..b86738e610 100644
--- a/tp/t/results/menu/menu_entry_node.pl
+++ b/tp/t/results/menu/menu_entry_node.pl
@@ -44,6 +44,15 @@ $result_trees{'menu_entry_node'} = {
                       'text' => 'a1'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -65,17 +74,6 @@ $result_trees{'menu_entry_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -104,6 +102,15 @@ $result_trees{'menu_entry_node'} = {
                       'text' => 'a2'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -125,17 +132,6 @@ $result_trees{'menu_entry_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -164,6 +160,15 @@ $result_trees{'menu_entry_node'} = {
                       'text' => 'a3'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -185,17 +190,6 @@ $result_trees{'menu_entry_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a3'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -230,6 +224,17 @@ $result_trees{'menu_entry_node'} = {
                       'cmdname' => ':'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0040a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -251,19 +256,6 @@ $result_trees{'menu_entry_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0040a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -316,16 +308,16 @@ $result_trees{'menu_entry_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[5];
 
 $result_texis{'menu_entry_node'} = '@menu
 * (f)a1::
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index 21a6d59b85..7a725ca540 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -44,6 +44,15 @@ $result_trees{'menu_entry_node_comments'} = {
                       'text' => 'a1c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a1c'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -77,17 +86,6 @@ $result_trees{'menu_entry_node_comments'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a1c'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -116,6 +114,15 @@ $result_trees{'menu_entry_node_comments'} = {
                       'text' => 'a2c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a2c'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -149,17 +156,6 @@ $result_trees{'menu_entry_node_comments'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a2c'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -188,6 +184,15 @@ $result_trees{'menu_entry_node_comments'} = {
                       'text' => 'a3c'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a3c'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -224,17 +229,6 @@ $result_trees{'menu_entry_node_comments'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a3c'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -270,6 +264,16 @@ $result_trees{'menu_entry_node_comments'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'a4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -303,18 +307,6 @@ $result_trees{'menu_entry_node_comments'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'a4'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -367,15 +359,15 @@ $result_trees{'menu_entry_node_comments'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[5];
 
 $result_texis{'menu_entry_node_comments'} = '@menu
 * (f)a1c::@c c
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index c7519886c0..8d08c371ba 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -140,6 +140,11 @@ $result_trees{'menu_in_deffn'} = {
                               'text' => ')'
                             }
                           ],
+                          'extra' => {
+                            'manual_content' => [
+                              {}
+                            ]
+                          },
                           'type' => 'menu_entry_node'
                         },
                         {
@@ -161,13 +166,6 @@ $result_trees{'menu_in_deffn'} = {
                           'type' => 'menu_entry_description'
                         }
                       ],
-                      'extra' => {
-                        'menu_entry_node_label' => {
-                          'manual_content' => [
-                            {}
-                          ]
-                        }
-                      },
                       'source_info' => {
                         'file_name' => '',
                         'line_nr' => 5,
@@ -284,7 +282,7 @@ 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ext
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_in_deffn'} = '@node first
 
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 942e5b4f99..a6a73099aa 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -80,6 +80,11 @@ $result_trees{'menu_in_example'} = {
                           'text' => ')'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ]
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -163,13 +168,6 @@ $result_trees{'menu_in_example'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ]
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 5,
@@ -288,6 +286,15 @@ $result_trees{'menu_in_example'} = {
                           'text' => 'menu'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ],
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'menu'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -309,17 +316,6 @@ $result_trees{'menu_in_example'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ],
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'menu'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -363,6 +359,15 @@ $result_trees{'menu_in_example'} = {
                           'text' => 'node'
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ],
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'node'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -384,17 +389,6 @@ $result_trees{'menu_in_example'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ],
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'node'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 15,
@@ -498,11 +492,11 @@ $result_trees{'menu_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[4];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[4];
 
 $result_texis{'menu_in_example'} = '@node first
 
diff --git a/tp/t/results/menu/menu_no_closed_after_empty_line.pl 
b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
index 2d48343230..ad46a4a5f8 100644
--- a/tp/t/results/menu/menu_no_closed_after_empty_line.pl
+++ b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
@@ -41,6 +41,11 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -62,13 +67,6 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -109,7 +107,7 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_no_closed_after_empty_line'} = '@menu
 * (manual_in_menu):: desc2
diff --git a/tp/t/results/menu/menu_no_closed_in_description.pl 
b/tp/t/results/menu/menu_no_closed_in_description.pl
index b86b741282..08fb6972e6 100644
--- a/tp/t/results/menu/menu_no_closed_in_description.pl
+++ b/tp/t/results/menu/menu_no_closed_in_description.pl
@@ -41,6 +41,11 @@ $result_trees{'menu_no_closed_in_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -61,13 +66,6 @@ $result_trees{'menu_no_closed_in_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -88,7 +86,7 @@ $result_trees{'menu_no_closed_in_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_no_closed_in_description'} = '@menu
 * (manual_in_menu):: desc';
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index 7c9a60660a..ed8bb8ce9d 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -77,18 +77,16 @@ $result_trees{'menu_node_unterminated'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'Examples-of-Login-Verification-Functions'
+                  },
                   'type' => 'menu_entry_node'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'Examples-of-Login-Verification-Functions'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -153,8 +151,8 @@ $result_trees{'menu_node_unterminated'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'menu_node_unterminated'} = '@node first
 
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index e07cc7fbb4..7a51845306 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -137,6 +137,12 @@ $result_trees{'menu_pointing_to_anchor'} = {
                       'text' => 'An anchor'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'An-anchor'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -158,14 +164,6 @@ $result_trees{'menu_pointing_to_anchor'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'An-anchor'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -228,7 +226,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'menu_pointing_to_anchor'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index ea706096da..2365b5b910 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -74,6 +74,12 @@ $result_trees{'menu_title_before_entries'} = {
                       'text' => 'chap subnode'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-subnode'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -95,14 +101,6 @@ $result_trees{'menu_title_before_entries'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-subnode'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -204,7 +202,7 @@ $result_trees{'menu_title_before_entries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'menu_title_before_entries'} = '@node Top
 
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index 0c03aca047..694aa3f57e 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -92,6 +92,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -140,6 +138,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'chapter 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -161,14 +165,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -203,6 +199,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -224,14 +226,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -275,6 +269,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'section chap 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-chap-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -296,14 +296,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-chap-2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -323,6 +315,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'unnumberedsec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -344,14 +342,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -498,6 +488,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -519,14 +515,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -742,6 +730,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'section chap 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-chap-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -763,14 +757,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-chap-2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 30,
@@ -790,6 +776,12 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'text' => 'unnumberedsec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -811,14 +803,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 31,
@@ -1017,14 +1001,14 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'missing_detailmenu_on_subnodes'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index e504bea912..88a7992912 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -69,6 +69,15 @@ $result_trees{'multiple_menus'} = {
                       'text' => 'a'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -90,17 +99,6 @@ $result_trees{'multiple_menus'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -187,6 +185,15 @@ $result_trees{'multiple_menus'} = {
                       'text' => 'b'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -208,17 +215,6 @@ $result_trees{'multiple_menus'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -283,10 +279,10 @@ $result_trees{'multiple_menus'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
 $result_texis{'multiple_menus'} = '@node Top
 
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 118e0b9c97..ebaa3d9cb5 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -73,6 +73,11 @@ $result_trees{'reference_to_external_manual'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -94,13 +99,6 @@ $result_trees{'reference_to_external_manual'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -165,7 +163,7 @@ $result_trees{'reference_to_external_manual'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'reference_to_external_manual'} = '
 @node first
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 94f4f88278..85bd151bd3 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -109,6 +109,12 @@ $result_trees{'sc_in_menu'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'NODE'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +154,6 @@ $result_trees{'sc_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'NODE'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -546,6 +544,15 @@ $result_trees{'sc_in_menu'} = {
                           }
                         }
                       ],
+                      'extra' => {
+                        'manual_content' => [
+                          {}
+                        ],
+                        'node_content' => [
+                          {}
+                        ],
+                        'normalized' => 'EXAMPLE-NODE'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -585,17 +592,6 @@ $result_trees{'sc_in_menu'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'manual_content' => [
-                        {}
-                      ],
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'EXAMPLE-NODE'
-                    }
-                  },
                   'source_info' => {
                     'file_name' => '',
                     'line_nr' => 20,
@@ -741,9 +737,9 @@ $result_trees{'sc_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'sc_in_menu'} = '
 @node first
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index 8d405dedca..9b21a53fdc 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -80,6 +80,12 @@ $result_trees{'simple'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -101,14 +107,6 @@ $result_trees{'simple'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -128,6 +126,12 @@ $result_trees{'simple'} = {
                       'text' => 'node name'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-name'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -149,14 +153,6 @@ $result_trees{'simple'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-name'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -188,6 +184,12 @@ $result_trees{'simple'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -209,14 +211,6 @@ $result_trees{'simple'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -236,6 +230,12 @@ $result_trees{'simple'} = {
                       'text' => 'last'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'last'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -265,14 +265,6 @@ $result_trees{'simple'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'last'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -315,6 +307,13 @@ $result_trees{'simple'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'last-node-entry'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -336,15 +335,6 @@ $result_trees{'simple'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'last-node-entry'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -411,12 +401,12 @@ $result_trees{'simple'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'simple'} = '
 Before menu.
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index 5770272ef9..2f6ba36ffb 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -80,6 +80,12 @@ $result_trees{'simple_no_menu'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -101,14 +107,6 @@ $result_trees{'simple_no_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -128,6 +126,12 @@ $result_trees{'simple_no_menu'} = {
                       'text' => 'node name'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-name'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -149,14 +153,6 @@ $result_trees{'simple_no_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-name'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -188,6 +184,12 @@ $result_trees{'simple_no_menu'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -209,14 +211,6 @@ $result_trees{'simple_no_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -236,6 +230,12 @@ $result_trees{'simple_no_menu'} = {
                       'text' => 'last'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'last'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -265,14 +265,6 @@ $result_trees{'simple_no_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'last'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -315,6 +307,13 @@ $result_trees{'simple_no_menu'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'last-node-entry'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -336,15 +335,6 @@ $result_trees{'simple_no_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'last-node-entry'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -411,12 +401,12 @@ $result_trees{'simple_no_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'simple_no_menu'} = '
 Before menu.
diff --git a/tp/t/results/menu/space_and_commands_in_menu_node.pl 
b/tp/t/results/menu/space_and_commands_in_menu_node.pl
index bab1c71b7c..16a0235b69 100644
--- a/tp/t/results/menu/space_and_commands_in_menu_node.pl
+++ b/tp/t/results/menu/space_and_commands_in_menu_node.pl
@@ -92,6 +92,12 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'chap  b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -146,6 +144,14 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => ' b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -167,16 +173,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -196,6 +192,12 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'chap b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -217,14 +219,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -253,6 +247,15 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -274,17 +277,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -310,6 +302,14 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => ' b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -331,16 +331,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -366,6 +356,14 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -387,16 +385,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -434,6 +422,14 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => ' b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -455,16 +451,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -496,6 +482,12 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'chap b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -517,14 +509,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -565,6 +549,15 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                       'text' => 'b'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'chap-b'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -586,17 +579,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'chap-b'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -732,29 +714,29 @@ $result_trees{'space_and_commands_in_menu_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node_label'}{'node_content'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[3];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'space_and_commands_in_menu_node'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index f1fe034cf2..dc9c985239 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -98,6 +98,11 @@ $result_trees{'verb_in_menu_description'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -151,13 +156,6 @@ $result_trees{'verb_in_menu_description'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -235,7 +233,7 @@ $result_trees{'verb_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'verb_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 0a80704c53..9f843ec25f 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -158,6 +158,12 @@ $result_trees{'anchor_in_footnote'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -179,14 +185,6 @@ $result_trees{'anchor_in_footnote'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 9,
@@ -359,7 +357,7 @@ $result_trees{'anchor_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
index e36d4bdb78..730bd7d6ae 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -194,6 +194,12 @@ $result_trees{'anchor_in_footnote_separate'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -215,14 +221,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -395,7 +393,7 @@ $result_trees{'anchor_in_footnote_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
index 77b9539e58..0912099dfb 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -98,6 +98,12 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'node to avoid DocBook or LaTeX ignored'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -119,14 +125,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
-                }
-              },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 5,
@@ -146,6 +144,12 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'other nodes'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-nodes'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -167,14 +171,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-nodes'
-                }
-              },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 6,
@@ -1156,6 +1152,12 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => '!_"#$%&\'()*+-.'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1177,14 +1179,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 31,
@@ -1204,6 +1198,12 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => '/;<=>?[\\]^_`|~'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1225,14 +1225,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                }
-              },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 32,
@@ -1252,6 +1244,12 @@ $result_trees{'character_and_spaces_in_refs'} = {
                       'text' => 'local node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'local-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1273,14 +1271,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'local-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'character_and_spaces_in_refs_text.texi',
                 'line_nr' => 33,
@@ -1361,8 +1351,8 @@ $result_trees{'character_and_spaces_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -1385,9 +1375,9 @@ 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'con
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs'}{'contents'}[7] = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'character_and_spaces_in_refs'}{'contents'}[8] = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'};
 $result_trees{'character_and_spaces_in_refs'}{'contents'}[9] = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'};
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
index 9e366abcc8..a6508a4bd7 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -99,6 +99,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'node to avoid DocBook or LaTeX ignored'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -120,14 +126,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 5,
@@ -147,6 +145,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'other nodes'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'other-nodes'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -168,14 +172,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'other-nodes'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 6,
@@ -1173,6 +1169,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => '!_"#$%&\'()*+-.'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1194,14 +1196,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 31,
@@ -1221,6 +1215,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => '/;<=>?[\\]^_`|~'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1242,14 +1242,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 32,
@@ -1269,6 +1261,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'text' => 'local node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'local-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1290,14 +1288,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'local-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'character_and_spaces_in_refs_text.texi',
                   'line_nr' => 33,
@@ -1406,8 +1396,8 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'unit_command'} 
= $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -1432,9 +1422,9 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'extra'}{'unit_command'} =
 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[2]{'extra'}{'unit_command'} 
= $result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[3]{'contents'}[0] = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'character_and_spaces_in_refs_out'}[3]{'extra'}{'unit_command'} 
= 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'};
diff --git a/tp/t/results/moresectioning/complex.pl 
b/tp/t/results/moresectioning/complex.pl
index 13f830aefb..805e551a5f 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -122,6 +122,12 @@ $result_trees{'complex'} = [
                         'text' => 'First node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'First-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -143,14 +149,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'First-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 4,
@@ -170,6 +168,12 @@ $result_trees{'complex'} = [
                         'text' => 'between node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'between-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -191,14 +195,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'between-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 5,
@@ -218,6 +214,12 @@ $result_trees{'complex'} = [
                         'text' => 'Second node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'Second-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -239,14 +241,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'Second-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 6,
@@ -266,6 +260,12 @@ $result_trees{'complex'} = [
                         'text' => 'Third node unnumbered'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'Third-node-unnumbered'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -287,14 +287,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'Third-node-unnumbered'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 7,
@@ -314,6 +306,12 @@ $result_trees{'complex'} = [
                         'text' => 'continuity'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'continuity'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -335,14 +333,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'continuity'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 8,
@@ -362,6 +352,12 @@ $result_trees{'complex'} = [
                         'text' => 'Last node no description'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'Last-node-no-description'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -383,14 +379,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'Last-node-no-description'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 9,
@@ -580,6 +568,12 @@ $result_trees{'complex'} = [
                         'text' => 'unnumbered'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -601,14 +595,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 17,
@@ -628,6 +614,12 @@ $result_trees{'complex'} = [
                         'text' => 'unnumbered2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -649,14 +641,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 18,
@@ -676,6 +660,12 @@ $result_trees{'complex'} = [
                         'text' => 'numbered'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -697,14 +687,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 19,
@@ -874,6 +856,12 @@ $result_trees{'complex'} = [
                         'text' => 'unnumbered sub'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered-sub'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -895,14 +883,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered-sub'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 27,
@@ -922,6 +902,12 @@ $result_trees{'complex'} = [
                         'text' => 'numbered sub'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered-sub'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -943,14 +929,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered-sub'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 28,
@@ -970,6 +948,12 @@ $result_trees{'complex'} = [
                         'text' => 'unnumbered sub2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered-sub2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -991,14 +975,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered-sub2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 29,
@@ -1018,6 +994,12 @@ $result_trees{'complex'} = [
                         'text' => 'numbered sub2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered-sub2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1039,14 +1021,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered-sub2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 30,
@@ -1509,6 +1483,12 @@ $result_trees{'complex'} = [
                         'text' => 'numbered sub3'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered-sub3'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1530,14 +1510,6 @@ $result_trees{'complex'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered-sub3'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 49,
@@ -2322,29 +2294,29 @@ $result_trees{'complex'} = [
 ];
 
$result_trees{'complex'}[0]{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'complex'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex'}[0]{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = $result_trees{'complex'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex'}[0]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[0]{'contents'}[2];
 
$result_trees{'complex'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'complex'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex'}[1]{'contents'}[0]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'complex'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex'}[1]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[1]{'contents'}[1];
-$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex'}[2]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[2]{'contents'}[1];
 $result_trees{'complex'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[3]{'contents'}[1];
 $result_trees{'complex'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[4]{'contents'}[1];
 $result_trees{'complex'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[5]{'contents'}[1];
 $result_trees{'complex'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[6]{'contents'}[1];
-$result_trees{'complex'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex'}[7]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[7]{'contents'}[1];
 $result_trees{'complex'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[8]{'contents'}[1];
 
$result_trees{'complex'}[9]{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'complex'}[9]{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/complex_split_at_node.pl 
b/tp/t/results/moresectioning/complex_split_at_node.pl
index 10f4347e49..9e04249ede 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -122,6 +122,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'First node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'First-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -143,14 +149,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'First-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 4,
@@ -170,6 +168,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'between node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'between-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -191,14 +195,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'between-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 5,
@@ -218,6 +214,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'Second node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'Second-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -239,14 +241,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'Second-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 6,
@@ -266,6 +260,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'Third node unnumbered'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'Third-node-unnumbered'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -287,14 +287,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'Third-node-unnumbered'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 7,
@@ -314,6 +306,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'continuity'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'continuity'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -335,14 +333,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'continuity'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 8,
@@ -362,6 +352,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'Last node no description'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'Last-node-no-description'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -383,14 +379,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'Last-node-no-description'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 9,
@@ -580,6 +568,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'unnumbered'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -601,14 +595,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 17,
@@ -628,6 +614,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'unnumbered2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -649,14 +641,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 18,
@@ -676,6 +660,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'numbered'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -697,14 +687,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 19,
@@ -874,6 +856,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'unnumbered sub'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered-sub'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -895,14 +883,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered-sub'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 27,
@@ -922,6 +902,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'numbered sub'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered-sub'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -943,14 +929,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered-sub'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 28,
@@ -970,6 +948,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'unnumbered sub2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'unnumbered-sub2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -991,14 +975,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'unnumbered-sub2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 29,
@@ -1018,6 +994,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'numbered sub2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered-sub2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1039,14 +1021,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered-sub2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 30,
@@ -1509,6 +1483,12 @@ $result_trees{'complex_split_at_node'} = [
                         'text' => 'numbered sub3'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'numbered-sub3'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -1530,14 +1510,6 @@ $result_trees{'complex_split_at_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'numbered-sub3'
-                  }
-                },
                 'source_info' => {
                   'file_name' => 'complex_sectioning_case.texi',
                   'line_nr' => 49,
@@ -2338,29 +2310,29 @@ $result_trees{'complex_split_at_node'} = [
 ];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[1]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[2]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[7]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
index 914c2a08c4..9a5e646770 100644
--- a/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document_after_node.pl
@@ -92,6 +92,12 @@ $result_trees{'contents_at_end_document_after_node'} = {
                       'text' => 'a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'contents_at_end_document_after_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -298,7 +296,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
 $result_texis{'contents_at_end_document_after_node'} = '@node Top
diff --git a/tp/t/results/moresectioning/empty_top_node_up.pl 
b/tp/t/results/moresectioning/empty_top_node_up.pl
index 173ccd6e36..66cfb2d652 100644
--- a/tp/t/results/moresectioning/empty_top_node_up.pl
+++ b/tp/t/results/moresectioning/empty_top_node_up.pl
@@ -92,6 +92,12 @@ $result_trees{'empty_top_node_up'} = {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'empty_top_node_up'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -220,7 +218,7 @@ $result_trees{'empty_top_node_up'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'empty_top_node_up'} = '@node Top
 @top empty top node up
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index c3af41e166..76ee3aee87 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -107,6 +107,12 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -128,14 +134,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -504,7 +502,7 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
   'type' => 'document_root'
 };
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'label'}
 = $result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2];
diff --git a/tp/t/results/moresectioning/internal_top_node_up.pl 
b/tp/t/results/moresectioning/internal_top_node_up.pl
index 303d00f008..c7621bb07b 100644
--- a/tp/t/results/moresectioning/internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/internal_top_node_up.pl
@@ -93,6 +93,12 @@ $result_trees{'internal_top_node_up'} = [
                         'text' => 'chap'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'internal_top_node_up'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -233,7 +231,7 @@ $result_trees{'internal_top_node_up'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'internal_top_node_up'}[0]{'extra'}{'unit_command'} = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1];
 $result_trees{'internal_top_node_up'}[1]{'extra'}{'unit_command'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/lowered_subsubsection.pl 
b/tp/t/results/moresectioning/lowered_subsubsection.pl
index 4d3318a067..80f082fa61 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -87,6 +87,12 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'Chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -108,14 +114,6 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -257,6 +255,12 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'Section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -278,14 +282,6 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -432,6 +428,12 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'Subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -453,14 +455,6 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -607,6 +601,12 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'Subsubsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Subsubsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -628,14 +628,6 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Subsubsection'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -655,6 +647,12 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'Lowered subsec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Lowered-subsec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -676,14 +674,6 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Lowered-subsec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 27,
@@ -909,6 +899,12 @@ $result_trees{'lowered_subsubsection'} = {
                       'text' => 'Lowered subsubsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Lowered-subsubsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -930,14 +926,6 @@ $result_trees{'lowered_subsubsection'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Lowered-subsubsection'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 38,
@@ -1113,12 +1101,12 @@ $result_trees{'lowered_subsubsection'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'lowered_subsubsection'} = '@node Top
 @top
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 7f39889903..d7dbecea41 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -92,6 +92,12 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'n c2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'n-c2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'more_sections_than_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'n-c2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -140,6 +138,12 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'n c3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'n-c3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -161,14 +165,6 @@ $result_trees{'more_sections_than_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'n-c3'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -188,6 +184,12 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'n c3 s1 s2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'n-c3-s1-s2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -209,14 +211,6 @@ $result_trees{'more_sections_than_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'n-c3-s1-s2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -559,6 +553,12 @@ $result_trees{'more_sections_than_nodes'} = {
                       'text' => 'n c3 s 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'n-c3-s-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -580,14 +580,6 @@ $result_trees{'more_sections_than_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'n-c3-s-2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 21,
@@ -1033,13 +1025,13 @@ $result_trees{'more_sections_than_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[2]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/no_element.pl 
b/tp/t/results/moresectioning/no_element.pl
index da87c732c5..e672b5e6af 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -475,6 +475,12 @@ $result_trees{'no_element'} = {
                       'text' => 'An anchor'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'An-anchor'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -496,14 +502,6 @@ $result_trees{'no_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'An-anchor'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 29,
@@ -607,7 +605,7 @@ 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[19];
 
 $result_texis{'no_element'} = '@settitle no_element test
diff --git a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
index 15f17dc671..87e5bca761 100644
--- a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
@@ -248,6 +248,12 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                         'text' => 'chap'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -269,14 +275,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -487,7 +485,7 @@ 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'extra'}{'unit_command'} 
= $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
index 62ff92d373..8d391d1cae 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
@@ -248,6 +248,12 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                         'text' => 'chap'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -269,14 +275,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -487,7 +485,7 @@ 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'unit_command'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
index 80591a0b45..74a8e01dbe 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
@@ -158,6 +158,12 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                         'text' => 'chap'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -179,14 +185,6 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -350,7 +348,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'extra'}{'unit_command'} = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 608275d7e3..d1a87af604 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -402,6 +402,12 @@ $result_trees{'placed_things_before_element'} = {
                       'text' => 'An anchor'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'An-anchor'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -423,14 +429,6 @@ $result_trees{'placed_things_before_element'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'An-anchor'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -660,7 +658,7 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'con
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index b11803d3bf..46e5606822 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -406,6 +406,12 @@ $result_trees{'placed_things_before_node'} = {
                       'text' => 'An anchor'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'An-anchor'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -427,14 +433,6 @@ $result_trees{'placed_things_before_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'An-anchor'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -766,7 +764,7 @@ 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'conten
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[16];
 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index 5ce0296f99..8349388795 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -113,6 +113,12 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'Chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -134,14 +140,6 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -161,6 +159,12 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'Second chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Second-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -182,14 +186,6 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Second-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -369,6 +365,12 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'Chapter in included file'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chapter-in-included-file'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -430,14 +432,6 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chapter-in-included-file'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -836,6 +830,12 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'Section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -857,14 +857,6 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 16,
@@ -1013,6 +1005,12 @@ $result_trees{'raiselowersections'} = {
                       'text' => 'Subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1034,14 +1032,6 @@ $result_trees{'raiselowersections'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_file.texi',
                 'line_nr' => 23,
@@ -1557,11 +1547,11 @@ $result_trees{'raiselowersections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'raiselowersections'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/moresectioning/rec_nodes.pl 
b/tp/t/results/moresectioning/rec_nodes.pl
index b526a4fd2f..c9db228eb6 100644
--- a/tp/t/results/moresectioning/rec_nodes.pl
+++ b/tp/t/results/moresectioning/rec_nodes.pl
@@ -69,6 +69,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'chap node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -90,14 +96,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -117,6 +115,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'node following second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-following-second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -138,14 +142,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-following-second'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -293,6 +289,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'other node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -314,14 +316,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -341,6 +335,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'chap node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -362,14 +362,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -506,6 +498,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'other node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -527,14 +525,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 19,
@@ -666,6 +656,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'node following second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-following-second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -687,14 +683,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-following-second'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -854,6 +842,12 @@ $result_trees{'rec_nodes'} = {
                       'text' => 'node up node following second'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-up-node-following-second'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -875,14 +869,6 @@ $result_trees{'rec_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-up-node-following-second'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 33,
@@ -947,18 +933,18 @@ $result_trees{'rec_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'rec_nodes'} = '@node Top
 Top node
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
index 4b9d8b026f..d083a847ef 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -142,6 +142,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -163,14 +169,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 10,
@@ -190,6 +188,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -211,14 +215,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 11,
@@ -238,6 +234,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'chapter 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -259,14 +261,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 12,
@@ -286,6 +280,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'chapter 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -307,14 +307,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 13,
@@ -334,6 +326,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -355,14 +353,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 14,
@@ -509,6 +499,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'section in chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-in-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -530,14 +526,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-in-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 21,
@@ -753,6 +741,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'section in unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-in-unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -774,14 +768,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-in-unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 31,
@@ -997,6 +983,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumberedsec 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1018,14 +1010,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 41,
@@ -1045,6 +1029,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumberedsec 2-1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-2_002d1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1066,14 +1056,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-2_002d1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 42,
@@ -1220,6 +1202,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered sub 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1241,14 +1229,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 49,
@@ -1268,6 +1248,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1289,14 +1275,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 50,
@@ -1316,6 +1294,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered sub2 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1337,14 +1321,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 51,
@@ -1364,6 +1340,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub2 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1385,14 +1367,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 52,
@@ -1815,6 +1789,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub 2-1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-2_002d1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1836,14 +1816,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-2_002d1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 71,
@@ -2064,6 +2036,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumberedsec 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2085,14 +2063,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 82,
@@ -2112,6 +2082,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'section 3-1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-3_002d1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2133,14 +2109,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-3_002d1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 83,
@@ -2160,6 +2128,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumberedsec 3-2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-3_002d2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2181,14 +2155,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-3_002d2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 84,
@@ -2208,6 +2174,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'section 3-3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-3_002d3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2229,14 +2201,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-3_002d3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 85,
@@ -2256,6 +2220,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumberedsec 3-4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-3_002d4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2277,14 +2247,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-3_002d4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 86,
@@ -2431,6 +2393,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered sub 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2452,14 +2420,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 93,
@@ -2479,6 +2439,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2500,14 +2466,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 94,
@@ -2527,6 +2485,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered sub2 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2548,14 +2512,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 95,
@@ -2575,6 +2531,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub2 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2596,14 +2558,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 96,
@@ -3095,6 +3049,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub 3-2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-3_002d2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3116,14 +3076,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-3_002d2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 118,
@@ -3339,6 +3291,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'subsection 3-3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-3_002d3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3360,14 +3318,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-3_002d3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 128,
@@ -3583,6 +3533,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub 3-4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-3_002d4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3604,14 +3560,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-3_002d4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 138,
@@ -3827,6 +3775,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumberedsec 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3848,14 +3802,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 148,
@@ -4002,6 +3948,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered sub 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4023,14 +3975,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 155,
@@ -4050,6 +3994,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4071,14 +4021,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 156,
@@ -4098,6 +4040,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'unnumbered sub2 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4119,14 +4067,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 157,
@@ -4146,6 +4086,12 @@ $result_trees{'section_in_unnumbered_info'} = {
                       'text' => 'numbered sub2 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4167,14 +4113,6 @@ $result_trees{'section_in_unnumbered_info'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 158,
@@ -4511,37 +4449,37 @@ $result_trees{'section_in_unnumbered_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_in_unnumbered_info'} = '
 @node Top
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index b1654c371f..86512bb1dd 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -142,6 +142,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -163,14 +169,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 10,
@@ -190,6 +188,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -211,14 +215,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 11,
@@ -238,6 +234,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'chapter 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -259,14 +261,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 12,
@@ -286,6 +280,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'chapter 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -307,14 +307,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 13,
@@ -334,6 +326,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -355,14 +353,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 14,
@@ -509,6 +499,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'section in chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-in-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -530,14 +526,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-in-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 21,
@@ -753,6 +741,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'section in unnumbered'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-in-unnumbered'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -774,14 +768,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-in-unnumbered'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 31,
@@ -997,6 +983,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumberedsec 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1018,14 +1010,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 41,
@@ -1045,6 +1029,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumberedsec 2-1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-2_002d1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1066,14 +1056,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-2_002d1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 42,
@@ -1220,6 +1202,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered sub 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1241,14 +1229,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 49,
@@ -1268,6 +1248,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1289,14 +1275,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 50,
@@ -1316,6 +1294,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered sub2 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1337,14 +1321,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 51,
@@ -1364,6 +1340,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub2 2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2-2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1385,14 +1367,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2-2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 52,
@@ -1815,6 +1789,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub 2-1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-2_002d1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1836,14 +1816,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-2_002d1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 71,
@@ -2064,6 +2036,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumberedsec 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2085,14 +2063,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 82,
@@ -2112,6 +2082,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'section 3-1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-3_002d1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2133,14 +2109,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-3_002d1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 83,
@@ -2160,6 +2128,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumberedsec 3-2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-3_002d2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2181,14 +2155,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-3_002d2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 84,
@@ -2208,6 +2174,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'section 3-3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-3_002d3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2229,14 +2201,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-3_002d3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 85,
@@ -2256,6 +2220,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumberedsec 3-4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-3_002d4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2277,14 +2247,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-3_002d4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 86,
@@ -2431,6 +2393,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered sub 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2452,14 +2420,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 93,
@@ -2479,6 +2439,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2500,14 +2466,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 94,
@@ -2527,6 +2485,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered sub2 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2548,14 +2512,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 95,
@@ -2575,6 +2531,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub2 3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2-3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2596,14 +2558,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2-3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 96,
@@ -3095,6 +3049,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub 3-2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-3_002d2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3116,14 +3076,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-3_002d2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 118,
@@ -3339,6 +3291,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'subsection 3-3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection-3_002d3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3360,14 +3318,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection-3_002d3'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 128,
@@ -3583,6 +3533,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub 3-4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-3_002d4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3604,14 +3560,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-3_002d4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 138,
@@ -3827,6 +3775,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumberedsec 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumberedsec-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -3848,14 +3802,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumberedsec-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 148,
@@ -4002,6 +3948,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered sub 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4023,14 +3975,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 155,
@@ -4050,6 +3994,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4071,14 +4021,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 156,
@@ -4098,6 +4040,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'unnumbered sub2 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unnumbered-sub2-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4119,14 +4067,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unnumbered-sub2-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 157,
@@ -4146,6 +4086,12 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                       'text' => 'numbered sub2 4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'numbered-sub2-4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -4167,14 +4113,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'numbered-sub2-4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'section_in_unnumbered_text.texi',
                 'line_nr' => 158,
@@ -4511,37 +4449,37 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_in_unnumbered_plaintext'} = '
 @node Top
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index 5e975814e8..92b1cb73c9 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -173,6 +173,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -193,14 +199,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 10,
@@ -220,6 +218,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "CARRIAGE RETURN|\r|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "CARRIAGE-RETURN_007c-_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -240,14 +244,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "CARRIAGE-RETURN_007c-_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 11,
@@ -267,6 +263,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK 
SPACE|\x{a0}| OGHAM SPACE MARK|\x{1680}|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -287,14 +289,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 12,
@@ -314,6 +308,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -334,14 +334,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 13,
@@ -361,6 +353,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -381,14 +379,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 14,
@@ -408,6 +398,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -428,14 +424,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 15,
@@ -455,6 +443,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "HAIR SPACE|\x{200a}| LINE SEPARATOR|\x{2028}| 
PARAGRAPH SEPARATOR|\x{2029}|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -475,14 +469,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 16,
@@ -502,6 +488,12 @@ $result_trees{'special_spaces_in_nodes'} = {
                       "text" => "NARROW NO-BREAK SPACE|\x{202f}| MEDIUM 
MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -522,14 +514,6 @@ $result_trees{'special_spaces_in_nodes'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c"
-                }
-              },
               "source_info" => {
                 "file_name" => "special_spaces_in_nodes.texi",
                 "line_nr" => 17,
@@ -939,14 +923,14 @@ $result_trees{'special_spaces_in_nodes'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[0]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[0]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[1]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[2]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[3]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[3]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[4]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[5]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[6]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[7]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[7]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[0]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[0]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[2]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[3]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[3]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[7]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[7]{"contents"}[1]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[1]{"contents"}[0]{"extra"}{"label"}
 = $result_trees{'special_spaces_in_nodes'}{"contents"}[7];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[1]{"contents"}[0]{"extra"}{"node_argument"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[1]{"contents"}[0]{"args"}[0]{"contents"}[0];
 
diff --git a/tp/t/results/moresectioning/top_node_up_url.pl 
b/tp/t/results/moresectioning/top_node_up_url.pl
index f0ee6044e6..02bb74c8a9 100644
--- a/tp/t/results/moresectioning/top_node_up_url.pl
+++ b/tp/t/results/moresectioning/top_node_up_url.pl
@@ -93,6 +93,12 @@ $result_trees{'top_node_up_url'} = [
                         'text' => 'chap'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'top_node_up_url'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -233,7 +231,7 @@ $result_trees{'top_node_up_url'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'top_node_up_url'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[1];
 $result_trees{'top_node_up_url'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/topic_guide.pl 
b/tp/t/results/moresectioning/topic_guide.pl
index 6efa581597..e5c722bb8c 100644
--- a/tp/t/results/moresectioning/topic_guide.pl
+++ b/tp/t/results/moresectioning/topic_guide.pl
@@ -131,6 +131,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -152,14 +158,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 10,
@@ -179,6 +177,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -200,14 +204,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 11,
@@ -368,6 +364,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'topic1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'topic1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -389,14 +391,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'topic1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 20,
@@ -416,6 +410,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'topic2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'topic2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -437,14 +437,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'topic2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 21,
@@ -464,6 +456,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'topic5'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'topic5'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -485,14 +483,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'topic5'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 22,
@@ -657,6 +647,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -678,14 +674,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 32,
@@ -871,6 +859,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -892,14 +886,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 42,
@@ -1215,6 +1201,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1236,14 +1228,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 61,
@@ -1418,6 +1402,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1439,14 +1429,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide1'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 71,
@@ -1466,6 +1448,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'guide2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'guide2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1487,14 +1475,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'guide2'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 72,
@@ -1657,6 +1637,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'topic5'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'topic5'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1678,14 +1664,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'topic5'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 81,
@@ -1705,6 +1683,12 @@ $result_trees{'topic_guide'} = {
                       'text' => 'topic4'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'topic4'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1726,14 +1710,6 @@ $result_trees{'topic_guide'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'topic4'
-                }
-              },
               'source_info' => {
                 'file_name' => 'topic_guide.texi',
                 'line_nr' => 82,
@@ -1811,24 +1787,24 @@ $result_trees{'topic_guide'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[9]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[9]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'topic_guide'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 41f031ca17..cfddfdcc7b 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -429,6 +429,12 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'Preface'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Preface'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -450,14 +456,6 @@ $result_trees{'japanese_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Preface'
-                }
-              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 26,
@@ -477,6 +475,12 @@ $result_trees{'japanese_utf8'} = {
                       'text' => 'Introduction'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Introduction'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -498,14 +502,6 @@ $result_trees{'japanese_utf8'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Introduction'
-                }
-              },
               'source_info' => {
                 'file_name' => 'japanese_utf8.texi',
                 'line_nr' => 27,
@@ -754,8 +750,8 @@ $result_trees{'japanese_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'japanese_utf8'} = '\\input texinfo @c -*- coding: utf-8; mode: 
texinfo; -*-
 @documentencoding UTF-8
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 03812bf35b..070afaaf26 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -2121,6 +2121,15 @@ $result_trees{'line_passed_and_formats'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -2142,17 +2151,6 @@ $result_trees{'line_passed_and_formats'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 135,
@@ -2226,8 +2224,8 @@ $result_trees{'line_passed_and_formats'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
 $result_texis{'line_passed_and_formats'} = '@node Top
 
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 2d942896ae..c7ec3be40c 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1332,6 +1332,14 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'blah'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'blah_003ablah'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1353,16 +1361,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'blah_003ablah'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 34,
@@ -1415,6 +1413,14 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'fump'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'blumpty_002efump'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1436,16 +1442,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'blumpty_002efump'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 35,
@@ -1465,6 +1461,12 @@ $result_trees{'quote_node_names'} = {
                       'text' => 'normal node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'normal-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1486,14 +1488,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'normal-node'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 36,
@@ -1561,6 +1555,12 @@ $result_trees{'quote_node_names'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'secret_002cnode'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -1582,14 +1582,6 @@ $result_trees{'quote_node_names'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'secret_002cnode'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 37,
@@ -1626,21 +1618,19 @@ $result_trees{'quote_node_names'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'u_002eal_0029ext_003a_003a'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'u_002eal_0029ext_003a_003a'
-                }
-              },
               'source_info' => {
                 'file_name' => 'nodequote.texi',
                 'line_nr' => 38,
@@ -1978,16 +1968,16 @@ 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[2];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3]{'contents'}[2];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[1];
 $result_trees{'quote_node_names'}{'contents'}[3] = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'quote_node_names'}{'contents'}[5] = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'};
 $result_trees{'quote_node_names'}{'contents'}[7] = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 6a53db0fb3..226d3dda07 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -244,6 +244,12 @@ $result_trees{'ref_in_copying'} = {
                       'text' => 'GFDL'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'GFDL'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -265,14 +271,6 @@ $result_trees{'ref_in_copying'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'GFDL'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -379,7 +377,7 @@ $result_trees{'ref_in_copying'} = {
   'type' => 'document_root'
 };
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'ref_in_copying'}{'contents'}[3] = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'};
 
 $result_texis{'ref_in_copying'} = '@copying
diff --git a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
index cdb43ccdec..f6291ab093 100644
--- a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
+++ b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
@@ -313,6 +313,12 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                       'text' => 'GFDL'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'GFDL'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -334,14 +340,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'GFDL'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 14,
@@ -448,7 +446,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
   'type' => 'document_root'
 };
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[5] = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'};
 
 $result_texis{'ref_in_copying_insert_in_chapter'} = '@copying
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 0f3f720d31..739d718f2b 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -107,6 +107,12 @@ $result_trees{'chapter_between_nodes'} = {
                       'text' => 'section node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -128,14 +134,6 @@ $result_trees{'chapter_between_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -371,7 +369,7 @@ $result_trees{'chapter_between_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes'} = '@node Top
diff --git a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
index 176497a007..a66c768a81 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
@@ -131,6 +131,12 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
                       'text' => 'Additional'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Additional'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -152,14 +158,6 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Additional'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -288,7 +286,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_with_appendix'} = '@node Top
 @top top section
diff --git 
a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
index 22448b8b67..4c71a4b125 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
@@ -131,6 +131,12 @@ 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'} = {
                       'text' => 'Additional'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Additional'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -152,14 +158,6 @@ 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Additional'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -288,7 +286,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_with_appendix_nomenu'} = '@node Top
 @top top section
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 5aae6053f2..bafaa4ad65 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
@@ -99,6 +99,12 @@ $result_trees{'chapter_node_before_and_after_part'} = {
                       'text' => 'after'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'after'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -120,14 +126,6 @@ $result_trees{'chapter_node_before_and_after_part'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'after'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -318,7 +316,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[5]{'extra'}{'associated_part'}
 = $result_trees{'chapter_node_before_and_after_part'}{'contents'}[3];
 
 $result_texis{'chapter_node_before_and_after_part'} = '
diff --git a/tp/t/results/sectioning/contents_and_parts.pl 
b/tp/t/results/sectioning/contents_and_parts.pl
index ca8565aad5..6f441fcf9e 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -98,6 +98,12 @@ $result_trees{'contents_and_parts'} = {
                       'text' => 'chapter 1 node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-1-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -119,14 +125,6 @@ $result_trees{'contents_and_parts'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-1-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -146,6 +144,12 @@ $result_trees{'contents_and_parts'} = {
                       'text' => 'chapter 2 node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-2-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -167,14 +171,6 @@ $result_trees{'contents_and_parts'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-2-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -194,6 +190,12 @@ $result_trees{'contents_and_parts'} = {
                       'text' => 'chapter 3 node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-3-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -215,14 +217,6 @@ $result_trees{'contents_and_parts'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-3-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -605,9 +599,9 @@ $result_trees{'contents_and_parts'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'contents_and_parts'}{'contents'}[5]{'extra'}{'associated_part'} 
= $result_trees{'contents_and_parts'}{'contents'}[3];
 
$result_trees{'contents_and_parts'}{'contents'}[10]{'extra'}{'associated_part'} 
= $result_trees{'contents_and_parts'}{'contents'}[8];
 
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index d29055b9bc..12acfb2c55 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -99,6 +99,12 @@ $result_trees{'double_part'} = [
                         'text' => 'node chapter'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'node-chapter'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -120,14 +126,6 @@ $result_trees{'double_part'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'node-chapter'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -380,7 +378,7 @@ $result_trees{'double_part'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'double_part'}[0]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[0];
 $result_trees{'double_part'}[0]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[0]{'contents'}[2];
 $result_trees{'double_part'}[1]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[1];
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index a4113960d3..aa77cb786f 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -86,6 +86,12 @@ $result_trees{'double_top_in_menu'} = {
                       'text' => 'top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -107,14 +113,6 @@ $result_trees{'double_top_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Top'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -134,6 +132,12 @@ $result_trees{'double_top_in_menu'} = {
                       'text' => 'TOP'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -155,14 +159,6 @@ $result_trees{'double_top_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Top'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -304,8 +300,8 @@ $result_trees{'double_top_in_menu'} = {
   'type' => 'document_root'
 };
 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index 7bfe1f64a3..18fa765b35 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -202,6 +202,12 @@ $result_trees{'equivalent_labels'} = {
                       'text' => 'anch'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'anch'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -223,14 +229,6 @@ $result_trees{'equivalent_labels'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'anch'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -265,6 +263,12 @@ $result_trees{'equivalent_labels'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'floa'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -286,14 +290,6 @@ $result_trees{'equivalent_labels'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'floa'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -358,8 +354,8 @@ $result_trees{'equivalent_labels'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'equivalent_labels'} = '@node first
 
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index bd9b458cfc..ab8cced130 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -107,6 +107,12 @@ $result_trees{'equivalent_nodes'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -128,14 +134,6 @@ $result_trees{'equivalent_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -296,7 +294,7 @@ $result_trees{'equivalent_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'equivalent_nodes'}{'contents'}[2];
 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index c3fca816cf..3134c041cd 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -65,6 +65,12 @@ $result_trees{'explicit_node_directions'} = [
                         'text' => 'chap node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -86,14 +92,6 @@ $result_trees{'explicit_node_directions'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -113,6 +111,12 @@ $result_trees{'explicit_node_directions'} = [
                         'text' => 'third node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'third-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -134,14 +138,6 @@ $result_trees{'explicit_node_directions'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'third-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -394,8 +390,8 @@ $result_trees{'explicit_node_directions'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[0]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 4040d76392..14fb2bd0e0 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -92,6 +92,12 @@ $result_trees{'external_node_in_menu'} = {
                       'text' => 'nchapter1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'nchapter1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'external_node_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'nchapter1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -149,6 +147,15 @@ $result_trees{'external_node_in_menu'} = {
                       'text' => 'other'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'other'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -170,17 +177,6 @@ $result_trees{'external_node_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'other'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -200,6 +196,12 @@ $result_trees{'external_node_in_menu'} = {
                       'text' => 'nchapter2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'nchapter2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -221,14 +223,6 @@ $result_trees{'external_node_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'nchapter2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -427,10 +421,10 @@ $result_trees{'external_node_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'external_node_in_menu'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
index 6d6b65b89f..7b0304ac34 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -103,6 +103,12 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                       "text" => "\x{2000}\x{2001}\x{2002}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "_2002_2003_2002"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -123,14 +129,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "_2002_2003_2002"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 6,
@@ -218,6 +216,12 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                       "text" => "\x{85}\x{a0}\x{1680}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "_0085_00a0_1680"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -238,14 +242,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "_0085_00a0_1680"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 9,
@@ -265,6 +261,12 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                       "text" => "\x{180e}\x{2003}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "_180e_2003"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -285,14 +287,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "_180e_2003"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 10,
@@ -312,6 +306,12 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                       "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{2028}\x{2029}\x{202f}\x{205f}\x{3000}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -332,14 +332,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 11,
@@ -796,10 +788,10 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_spaces_node'} = '
 @node Top
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index dce33a04b5..00311710fe 100644
--- a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
@@ -103,6 +103,12 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                       "text" => "\x{2000}\x{2001}\x{2002}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "_2002_2003_2002"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -123,14 +129,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "_2002_2003_2002"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 6,
@@ -218,6 +216,12 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                       "text" => "\x{85}\x{a0}\x{1680}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "_0085_00a0_1680"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -238,14 +242,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "_0085_00a0_1680"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 9,
@@ -265,6 +261,12 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                       "text" => "\x{180e}\x{2003}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => "_180e_2003"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -285,14 +287,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => "_180e_2003"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 10,
@@ -312,6 +306,12 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                       "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{2028}\x{2029}\x{202f}\x{205f}\x{3000}"
                     }
                   ],
+                  "extra" => {
+                    "node_content" => [
+                      {}
+                    ],
+                    "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
+                  },
                   "type" => "menu_entry_node"
                 },
                 {
@@ -332,14 +332,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
                   "type" => "menu_entry_description"
                 }
               ],
-              "extra" => {
-                "menu_entry_node_label" => {
-                  "node_content" => [
-                    {}
-                  ],
-                  "normalized" => 
"_2004_2005_2006_2007_2008_2009_200a_2028_2029_202f_205f_3000"
-                }
-              },
               "source_info" => {
                 "file_name" => "in_menu_only_special_spaces_node.texi",
                 "line_nr" => 11,
@@ -796,10 +788,10 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"extra"}{"menu_entry_node_label"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[3]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_spaces_node_menu'} = '
 @node Top
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 9943119ad2..9d6149ef2d 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -67,6 +67,12 @@ $result_trees{'lone_Top_node'} = [
                         'text' => 'First'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'First'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -88,14 +94,6 @@ $result_trees{'lone_Top_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'First'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -231,7 +229,7 @@ $result_trees{'lone_Top_node'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'lone_Top_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'lone_Top_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'lone_Top_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
 
 $result_texis{'lone_Top_node'} = '@node Top
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 5aab231cc9..805c875fc2 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -98,6 +98,12 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'chap node up'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node-up'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -119,14 +125,6 @@ $result_trees{'loop_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node-up'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -261,6 +259,12 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'node middle'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-middle'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -282,14 +286,6 @@ $result_trees{'loop_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-middle'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 11,
@@ -426,6 +422,12 @@ $result_trees{'loop_nodes'} = {
                       'text' => 'node down'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-down'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -447,14 +449,6 @@ $result_trees{'loop_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-down'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 17,
@@ -556,11 +550,11 @@ $result_trees{'loop_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'loop_nodes'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index e0e3d44d8f..3c23dfeae0 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -35,6 +35,12 @@ $result_trees{'menutextorder'} = {
                       'text' => 'foo'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'foo'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -56,14 +62,6 @@ $result_trees{'menutextorder'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'foo'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 2,
@@ -83,6 +81,12 @@ $result_trees{'menutextorder'} = {
                       'text' => 'bar'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'bar'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -104,14 +108,6 @@ $result_trees{'menutextorder'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'bar'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 3,
@@ -248,6 +244,12 @@ $result_trees{'menutextorder'} = {
                       'text' => 'onesub2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'onesub2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -269,14 +271,6 @@ $result_trees{'menutextorder'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'onesub2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -566,6 +560,12 @@ $result_trees{'menutextorder'} = {
                       'text' => 'sub1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'sub1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -587,14 +587,6 @@ $result_trees{'menutextorder'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'sub1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 24,
@@ -614,6 +606,12 @@ $result_trees{'menutextorder'} = {
                       'text' => 'sub3'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'sub3'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -635,14 +633,6 @@ $result_trees{'menutextorder'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'sub3'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 25,
@@ -662,6 +652,12 @@ $result_trees{'menutextorder'} = {
                       'text' => 'sub2'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'sub2'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -683,14 +679,6 @@ $result_trees{'menutextorder'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'sub2'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 26,
@@ -958,12 +946,12 @@ $result_trees{'menutextorder'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'menutextorder'} = '@menu
 * foo::
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 4cb87dc612..006e4ccab3 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -92,6 +92,12 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -267,6 +265,12 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -288,14 +292,6 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 12,
@@ -315,6 +311,12 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -336,14 +338,6 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -490,6 +484,12 @@ $result_trees{'next_in_menu_is_below'} = {
                       'text' => 'subsection'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'subsection'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -511,14 +511,6 @@ $result_trees{'next_in_menu_is_below'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'subsection'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 20,
@@ -648,10 +640,10 @@ $result_trees{'next_in_menu_is_below'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'next_in_menu_is_below'} = '@node Top
 @top top
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 fc1089b914..82bbc6b139 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -60,6 +60,12 @@ $result_trees{'next_no_prev_to_node'} = {
                       'text' => 'chap first node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -81,14 +87,6 @@ $result_trees{'next_no_prev_to_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -108,6 +106,12 @@ $result_trees{'next_no_prev_to_node'} = {
                       'text' => 'no return'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'no-return'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -129,14 +133,6 @@ $result_trees{'next_no_prev_to_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'no-return'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -339,8 +335,8 @@ $result_trees{'next_no_prev_to_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index 56b325e7a9..d2d7d6b136 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -66,6 +66,11 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => ')'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ]
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -87,13 +92,6 @@ $result_trees{'node_nested_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ]
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -122,6 +120,15 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => 'node name'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-name'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -143,17 +150,6 @@ $result_trees{'node_nested_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-name'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -200,6 +196,15 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => 'close)'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'close_0029'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -221,17 +226,6 @@ $result_trees{'node_nested_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'close_0029'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -272,6 +266,14 @@ $result_trees{'node_nested_parentheses'} = {
                       'text' => ' error'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0028_0029_0029_0029-error'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -293,16 +295,6 @@ $result_trees{'node_nested_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0028_0029_0029_0029-error'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -367,14 +359,14 @@ $result_trees{'node_nested_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node_label'}{'node_content'}[2]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
 
 $result_texis{'node_nested_parentheses'} = '@node first
 
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 99014c9ff4..0dabd17b2e 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -93,6 +93,12 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -141,6 +139,12 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                         'text' => 'part chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'part-chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -162,14 +166,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'part-chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -456,8 +452,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
 $result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[1];
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 dd91187028..01210be309 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -93,6 +93,12 @@ $result_trees{'node_part_chapter_after_top'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'node_part_chapter_after_top'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -302,7 +300,7 @@ $result_trees{'node_part_chapter_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'node_part_chapter_after_top'}[1]{'contents'}[1];
 $result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index a5d18e1697..243c918bc8 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -60,6 +60,12 @@ $result_trees{'node_referenced_in_ref'} = {
                       'text' => 'chap first level node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-first-level-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -81,14 +87,6 @@ $result_trees{'node_referenced_in_ref'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-first-level-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -270,7 +268,7 @@ $result_trees{'node_referenced_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'node_referenced_in_ref'}{'contents'}[3] = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 504cd9be12..ee0ff5f592 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -67,6 +67,12 @@ $result_trees{'node_up_external_node'} = [
                         'text' => 'chap first'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap-first'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -88,14 +94,6 @@ $result_trees{'node_up_external_node'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap-first'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -282,7 +280,7 @@ $result_trees{'node_up_external_node'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'node_up_external_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index f209cbad5b..f369148501 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -92,6 +92,12 @@ $result_trees{'nodename_parentheses'} = {
                       'text' => 'Node (with parentheses)'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Node-_0028with-parentheses_0029'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'nodename_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Node-_0028with-parentheses_0029'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -140,6 +138,12 @@ $result_trees{'nodename_parentheses'} = {
                       'text' => 'Other node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Other-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -161,14 +165,6 @@ $result_trees{'nodename_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Other-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -197,6 +193,15 @@ $result_trees{'nodename_parentheses'} = {
                       'text' => 'node'
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -218,17 +223,6 @@ $result_trees{'nodename_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -682,10 +676,10 @@ $result_trees{'nodename_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'nodename_parentheses'}{'contents'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
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 df875888ae..53fd2349d1 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
@@ -65,6 +65,12 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                         'text' => 'second node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'second-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -86,14 +92,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'second-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -113,6 +111,12 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                         'text' => 'third node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'third-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -134,14 +138,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'third-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -424,8 +420,8 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
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 56da00739d..e66cf31d5b 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
@@ -70,6 +70,12 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = {
                       'text' => 'second node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -91,14 +97,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -118,6 +116,12 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -139,14 +143,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -409,8 +405,8 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[3]{'contents'}[0];
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 cd84171117..378f6b558a 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
@@ -70,6 +70,12 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
                       'text' => 'second node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -91,14 +97,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -118,6 +116,12 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -139,14 +143,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -409,8 +405,8 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[3]{'contents'}[0];
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 013107cb22..3020d3ec3b 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
@@ -65,6 +65,12 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                         'text' => 'second node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'second-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -86,14 +92,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'second-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -113,6 +111,12 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = 
[
                         'text' => 'third node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'third-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -134,14 +138,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = 
[
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'third-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -408,8 +404,8 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
index 9e687732e8..0974a55b44 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
@@ -64,6 +64,12 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = {
                       'text' => 'second node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -85,14 +91,6 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -112,6 +110,12 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -133,14 +137,6 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -403,8 +399,8 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
index 2e6778d601..a7db76c61c 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
@@ -64,6 +64,12 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
                       'text' => 'second node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -85,14 +91,6 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -112,6 +110,12 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -133,14 +137,6 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -403,8 +399,8 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
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 f0585cf617..26ea99d815 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
@@ -65,6 +65,12 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                         'text' => 'chap node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -86,14 +92,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -113,6 +111,12 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                         'text' => 'third node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'third-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -134,14 +138,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'third-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -424,8 +420,8 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
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 a0dd9528c1..d679240efa 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
@@ -65,6 +65,12 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                         'text' => 'chap node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -86,14 +92,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -113,6 +111,12 @@ $result_trees{'nodes_after_top_before_section_sections'} = 
[
                         'text' => 'third node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'third-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -134,14 +138,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = 
[
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'third-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -408,8 +404,8 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
index e32fbf6313..78b1d333c3 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
@@ -64,6 +64,12 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
                       'text' => 'chap node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -85,14 +91,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -112,6 +110,12 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -133,14 +137,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -403,8 +399,8 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
index ad21cc1415..cc38b0bf76 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
@@ -64,6 +64,12 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
                       'text' => 'chap node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -85,14 +91,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -112,6 +110,12 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -133,14 +137,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -403,8 +399,8 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
index b89822616f..2453ad0262 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
@@ -64,6 +64,12 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
                       'text' => 'chap node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -85,14 +91,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -112,6 +110,12 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
                       'text' => 'third node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'third-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -133,14 +137,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'third-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -403,8 +399,8 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index a791907e79..6c4a88d8f3 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -112,6 +112,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'node in menu before top'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node-in-menu-before-top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -133,14 +139,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node-in-menu-before-top'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -365,6 +363,12 @@ $result_trees{'nodes_before_top'} = {
                       'text' => 'second node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'second-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -386,14 +390,6 @@ $result_trees{'nodes_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'second-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -525,10 +521,10 @@ $result_trees{'nodes_before_top'} = {
 };
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'nodes_before_top'} = '@node first, Top, ,(dir)
 
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 69221c49e5..8c962b1221 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
@@ -95,6 +95,12 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                         'text' => 'second node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'second-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -116,14 +122,6 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'second-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -280,7 +278,7 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
   }
 ];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index c4942d6e10..5bd218e8b9 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -104,6 +104,12 @@ $result_trees{'novalidate'} = {
                       'text' => 'not a node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'not-a-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -125,14 +131,6 @@ $result_trees{'novalidate'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'not-a-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -238,7 +236,7 @@ $result_trees{'novalidate'} = {
   'type' => 'document_root'
 };
 
$result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = $result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'novalidate'} = '
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 9f79c9c482..c10b1940dd 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -93,6 +93,12 @@ $result_trees{'part_chapter_after_top'} = [
                         'text' => 'chapter'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_chapter_after_top'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -302,7 +300,7 @@ $result_trees{'part_chapter_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_chapter_after_top'}[1]{'contents'}[0];
 $result_trees{'part_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index bf4e24c75b..6d898c46a1 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_after_top'} = [
                         'text' => 'chap part node after top'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chap-part-node-after-top'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_after_top'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chap-part-node-after-top'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -262,7 +260,7 @@ $result_trees{'part_node_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_after_top'}[0]{'contents'}[2];
 $result_trees{'part_node_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 96f0c1e018..2883f6aa77 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -198,6 +198,12 @@ $result_trees{'part_node_before_top'} = [
                         'text' => 'part node before top'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'part-node-before-top'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -219,14 +225,6 @@ $result_trees{'part_node_before_top'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'part-node-before-top'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 8,
@@ -297,7 +295,7 @@ $result_trees{'part_node_before_top'} = [
 ];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'extra'}{'associated_part'}
 = $result_trees{'part_node_before_top'}[0]{'contents'}[2];
 $result_trees{'part_node_before_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_before_top'}[0]{'contents'}[4];
 
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 d4a6e9fca3..da9c95ff2d 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_chapter_after_top'} = [
                         'text' => 'a node after part'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'a-node-after-part'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_chapter_after_top'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'a-node-after-part'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -141,6 +139,12 @@ $result_trees{'part_node_chapter_after_top'} = [
                         'text' => 'chapter'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -162,14 +166,6 @@ $result_trees{'part_node_chapter_after_top'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -492,8 +488,8 @@ $result_trees{'part_node_chapter_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 68ecaf6a95..5d3a0d003c 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_chapter_appendix'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_chapter_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -346,7 +344,7 @@ $result_trees{'part_node_chapter_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
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 c422d31e49..8ea210c15d 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -141,6 +139,12 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                         'text' => 'appendix node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'appendix-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -162,14 +166,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'appendix-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -427,8 +423,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
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 b692fbacfc..001b4f0fe1 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_node_part_appendix'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_node_part_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -141,6 +139,12 @@ $result_trees{'part_node_node_part_appendix'} = [
                         'text' => 'appendix part'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'appendix-part'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -162,14 +166,6 @@ $result_trees{'part_node_node_part_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'appendix-part'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -466,8 +462,8 @@ $result_trees{'part_node_node_part_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index b13cbd8bbd..ffeed9c789 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_part_appendix'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_part_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -386,7 +384,7 @@ $result_trees{'part_node_part_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
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 e2cb45aa45..91e0782fc7 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -93,6 +93,12 @@ $result_trees{'part_node_part_node_appendix'} = [
                         'text' => 'chapter node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -114,14 +120,6 @@ $result_trees{'part_node_part_node_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -141,6 +139,12 @@ $result_trees{'part_node_part_node_appendix'} = [
                         'text' => 'appendix node'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'appendix-node'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -162,14 +166,6 @@ $result_trees{'part_node_part_node_appendix'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'appendix-node'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -466,8 +462,8 @@ $result_trees{'part_node_part_node_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_part_node_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 35441badb3..e02446439f 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -117,6 +117,13 @@ $result_trees{'protected_node_parentheses'} = {
                       'text' => 'manual) name'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => '_0028manual_0029-name'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -138,15 +145,6 @@ $result_trees{'protected_node_parentheses'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => '_0028manual_0029-name'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -375,8 +373,8 @@ $result_trees{'protected_node_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1];
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index d2be567abb..3698cc6b23 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -181,6 +181,12 @@ $result_trees{'section_before_top'} = {
                       'text' => 'section node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -202,14 +208,6 @@ $result_trees{'section_before_top'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -273,7 +271,7 @@ $result_trees{'section_before_top'} = {
   'type' => 'document_root'
 };
 
$result_trees{'section_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'section_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_before_top'} = '@node section node,,,Top
 @section section 
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 9cc723551d..f12a8f2b51 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -143,6 +143,12 @@ $result_trees{'section_below_unnumbered'} = {
                       'text' => 'Unn'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Unn'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -164,14 +170,6 @@ $result_trees{'section_below_unnumbered'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Unn'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 10,
@@ -323,6 +321,12 @@ $result_trees{'section_below_unnumbered'} = {
                       'text' => 'Sec'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Sec'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -344,14 +348,6 @@ $result_trees{'section_below_unnumbered'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Sec'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 18,
@@ -512,8 +508,8 @@ $result_trees{'section_below_unnumbered'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_below_unnumbered'} = '
 @contents
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 400c25297c..1a350a1fbc 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -167,6 +167,12 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                       'text' => 'section node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'section-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -188,14 +194,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 8,
@@ -342,6 +340,12 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                       'text' => 'chapter node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chapter-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -363,14 +367,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chapter-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 15,
@@ -438,8 +434,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_chapter_before_top_nodes'} = '@node section node
 @section section 
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index fb626f2e1e..e13ba8f1ec 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -92,6 +92,12 @@ $result_trees{'semi_auto'} = {
                       'text' => 'Chap1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chap1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -113,14 +119,6 @@ $result_trees{'semi_auto'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chap1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -140,6 +138,12 @@ $result_trees{'semi_auto'} = {
                       'text' => 'Section non auto'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section-non-auto'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -161,14 +165,6 @@ $result_trees{'semi_auto'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section-non-auto'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -315,6 +311,12 @@ $result_trees{'semi_auto'} = {
                       'text' => 'Sec in chapter'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Sec-in-chapter'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -336,14 +338,6 @@ $result_trees{'semi_auto'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Sec-in-chapter'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 13,
@@ -581,9 +575,9 @@ $result_trees{'semi_auto'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index f80df257e1..ebda7fdaaf 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -67,6 +67,12 @@ $result_trees{'space_in_node'} = {
                       'text' => 'Chap    first here'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Chap-first-here'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -88,14 +94,6 @@ $result_trees{'space_in_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Chap-first-here'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -127,6 +125,12 @@ $result_trees{'space_in_node'} = {
                       'text' => 'Test   title'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Test-title'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -148,14 +152,6 @@ $result_trees{'space_in_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Test-title'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 6,
@@ -179,6 +175,13 @@ $result_trees{'space_in_node'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'Last-with-spaces'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -200,15 +203,6 @@ $result_trees{'space_in_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'Last-with-spaces'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -388,10 +382,10 @@ $result_trees{'space_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'space_in_node'} = '
 @node 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 47141045d6..e7685df1a7 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -60,6 +60,12 @@ $result_trees{'top_node_no_menu_direction'} = {
                       'text' => 'chap node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap-node'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -81,14 +87,6 @@ $result_trees{'top_node_no_menu_direction'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap-node'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -108,6 +106,12 @@ $result_trees{'top_node_no_menu_direction'} = {
                       'text' => 'TOP'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Top'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -129,14 +133,6 @@ $result_trees{'top_node_no_menu_direction'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Top'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 5,
@@ -269,8 +265,8 @@ $result_trees{'top_node_no_menu_direction'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 59e3e368c7..d529868b67 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -76,6 +76,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                         }
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => '_00e3'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -97,14 +103,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => '_00e3'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 4,
@@ -124,6 +122,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                         'text' => 'n'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'n'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -145,14 +149,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'n'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -187,6 +183,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                         }
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => '_00e2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -208,14 +210,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => '_00e2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -498,9 +492,9 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
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 26d5f7e14d..35aaa7f3f6 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -99,6 +99,12 @@ $result_trees{'two_nodes_at_the_end'} = [
                         'text' => 'chapter 1'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-1'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -120,14 +126,6 @@ $result_trees{'two_nodes_at_the_end'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-1'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -147,6 +145,12 @@ $result_trees{'two_nodes_at_the_end'} = [
                         'text' => 'node after chapter 1'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'node-after-chapter-1'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -168,14 +172,6 @@ $result_trees{'two_nodes_at_the_end'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'node-after-chapter-1'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -195,6 +191,12 @@ $result_trees{'two_nodes_at_the_end'} = [
                         'text' => 'node after chapter 2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'node-after-chapter-2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -216,14 +218,6 @@ $result_trees{'two_nodes_at_the_end'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'node-after-chapter-2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -512,9 +506,9 @@ $result_trees{'two_nodes_at_the_end'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[0]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index e6fe34f3f3..5e4042ccc0 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -99,6 +99,12 @@ $result_trees{'two_nodes_between_chapters'} = [
                         'text' => 'chapter 1'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-1'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -120,14 +126,6 @@ $result_trees{'two_nodes_between_chapters'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-1'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 5,
@@ -147,6 +145,12 @@ $result_trees{'two_nodes_between_chapters'} = [
                         'text' => 'node between chapters'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'node-between-chapters'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -168,14 +172,6 @@ $result_trees{'two_nodes_between_chapters'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'node-between-chapters'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 6,
@@ -195,6 +191,12 @@ $result_trees{'two_nodes_between_chapters'} = [
                         'text' => 'chapter 2'
                       }
                     ],
+                    'extra' => {
+                      'node_content' => [
+                        {}
+                      ],
+                      'normalized' => 'chapter-2'
+                    },
                     'type' => 'menu_entry_node'
                   },
                   {
@@ -216,14 +218,6 @@ $result_trees{'two_nodes_between_chapters'} = [
                     'type' => 'menu_entry_description'
                   }
                 ],
-                'extra' => {
-                  'menu_entry_node_label' => {
-                    'node_content' => [
-                      {}
-                    ],
-                    'normalized' => 'chapter-2'
-                  }
-                },
                 'source_info' => {
                   'file_name' => '',
                   'line_nr' => 7,
@@ -536,9 +530,9 @@ $result_trees{'two_nodes_between_chapters'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[0]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index 855bbdc204..063f1cdb08 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -60,6 +60,12 @@ $result_trees{'unknown_node_in_menu'} = {
                       'text' => 'unknown'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'unknown'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -81,14 +87,6 @@ $result_trees{'unknown_node_in_menu'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'unknown'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -153,7 +151,7 @@ $result_trees{'unknown_node_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'unknown_node_in_menu'} = '@node first
 
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index 5073eda7ce..d284698dea 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -151,6 +151,12 @@ $result_trees{'master_menu_fr'} = {
                       'text' => 'chap'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'chap'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -172,14 +178,6 @@ $result_trees{'master_menu_fr'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'chap'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
                 'line_nr' => 9,
@@ -263,6 +261,14 @@ $result_trees{'master_menu_fr'} = {
                           'text' => 'section'
                         }
                       ],
+                      'extra' => {
+                        'node_content' => [
+                          {
+                            'text' => 'section'
+                          }
+                        ],
+                        'normalized' => 'section'
+                      },
                       'type' => 'menu_entry_node'
                     },
                     {
@@ -284,14 +290,6 @@ $result_trees{'master_menu_fr'} = {
                       'type' => 'menu_entry_description'
                     }
                   ],
-                  'extra' => {
-                    'menu_entry_node_label' => {
-                      'node_content' => [
-                        {}
-                      ],
-                      'normalized' => 'section'
-                    }
-                  },
                   'type' => 'menu_entry'
                 },
                 {
@@ -462,6 +460,14 @@ $result_trees{'master_menu_fr'} = {
                       'text' => 'section'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {
+                        'text' => 'section'
+                      }
+                    ],
+                    'normalized' => 'section'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -483,14 +489,6 @@ $result_trees{'master_menu_fr'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'section'
-                }
-              },
               'source_info' => {
                 'file_name' => 'no_master_menu_fr.texi',
                 'line_nr' => 16,
@@ -620,9 +618,7 @@ $result_trees{'master_menu_fr'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'master_menu_fr'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 614718da29..6b155415e0 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -218,6 +218,13 @@ $result_trees{'value_in_node'} = {
                       'type' => 'space_at_end_menu_node'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {},
+                      {}
+                    ],
+                    'normalized' => 'Node-1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -239,15 +246,6 @@ $result_trees{'value_in_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {},
-                    {}
-                  ],
-                  'normalized' => 'Node-1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 7,
@@ -508,6 +506,12 @@ $result_trees{'value_in_node'} = {
                       'text' => 'Section 1.1'
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'Section-1_002e1'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -529,14 +533,6 @@ $result_trees{'value_in_node'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'Section-1_002e1'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 16,
@@ -754,11 +750,11 @@ $result_trees{'value_in_node'} = {
 
$result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[1]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'value_in_node'}{'contents'}[3];
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 86c928f7c5..63750d0cb3 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -723,6 +723,12 @@ $result_trees{'image_inline_or_not'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'node_005fimage'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -765,14 +771,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'node_005fimage'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 35,
@@ -849,6 +847,15 @@ $result_trees{'image_inline_or_not'} = {
                       }
                     }
                   ],
+                  'extra' => {
+                    'manual_content' => [
+                      {}
+                    ],
+                    'node_content' => [
+                      {}
+                    ],
+                    'normalized' => 'extnode'
+                  },
                   'type' => 'menu_entry_node'
                 },
                 {
@@ -870,17 +877,6 @@ $result_trees{'image_inline_or_not'} = {
                   'type' => 'menu_entry_description'
                 }
               ],
-              'extra' => {
-                'menu_entry_node_label' => {
-                  'manual_content' => [
-                    {}
-                  ],
-                  'node_content' => [
-                    {}
-                  ],
-                  'normalized' => 'extnode'
-                }
-              },
               'source_info' => {
                 'file_name' => '',
                 'line_nr' => 36,
@@ -1424,9 +1420,9 @@ $result_trees{'image_inline_or_not'} = {
   'type' => 'document_root'
 };
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'manual_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'menu_entry_node_label'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'caption'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[4];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'float_section'}
 = $result_trees{'image_inline_or_not'}{'contents'}[4];



reply via email to

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