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 (register_label, get_label


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Common.pm (register_label, get_label_element), tp/Texinfo/Convert/Converter.pm (node_information_filename) (_set_tree_units_files, sort_element_counts), tp/Texinfo/Convert/HTML.pm (command_text, _normalized_label_id_file) (_set_root_commands_targets_node_files, _external_node_href, output), tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Info.pm (output) (format_node), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (set_nodes_list_labels), t [...]
Date: Sun, 26 Feb 2023 07:32:24 -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 1826809742 * tp/Texinfo/Common.pm (register_label, get_label_element), 
tp/Texinfo/Convert/Converter.pm (node_information_filename) 
(_set_tree_units_files, sort_element_counts), tp/Texinfo/Convert/HTML.pm 
(command_text, _normalized_label_id_file) 
(_set_root_commands_targets_node_files, _external_node_href, output), 
tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Info.pm (output) (format_node), 
tp/Texinfo/Convert/LaTeX.pm (_convert), 
tp/Texinfo/Convert/NodeNameNormalization.pm (set_ [...]
1826809742 is described below

commit 18268097424ca2e0d1f823d9790b3859a926ed64
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Feb 26 13:15:08 2023 +0100

    * tp/Texinfo/Common.pm (register_label, get_label_element),
    tp/Texinfo/Convert/Converter.pm (node_information_filename)
    (_set_tree_units_files, sort_element_counts),
    tp/Texinfo/Convert/HTML.pm (command_text, _normalized_label_id_file)
    (_set_root_commands_targets_node_files, _external_node_href, output),
    tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Info.pm (output)
    (format_node), tp/Texinfo/Convert/LaTeX.pm (_convert),
    tp/Texinfo/Convert/NodeNameNormalization.pm (set_nodes_list_labels),
    tp/Texinfo/Convert/Plaintext.pm (process_footnotes, node_line)
    (_convert), tp/Texinfo/Convert/Texinfo.pm
    (target_element_to_texi_label), tp/Texinfo/Convert/TexinfoMarkup.pm
    (_convert), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line)
    (_end_line_starting_block, _process_remaining_on_line),
    tp/Texinfo/Structuring.pm (_check_node_same_texinfo_code)
    (_check_menu_entry, check_nodes_are_referenced)
    (complete_node_tree_with_menus, nodes_tree)
    (associate_internal_references, number_floats, new_node_menu_entry),
    tp/Texinfo/Transformations.pm (_new_node),
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block)
    (end_line_misc_line), tp/Texinfo/XS/parsetexi/labels.c
    (register_label), tp/Texinfo/XS/parsetexi/separator.c
    (handle_close_brace), tp/init/documentation_examples.pm: do not
    register the label element in register_label, instead use directly
    arguments, first argument of node or anchor, second argument of float,
    possibly using get_label_element when the element command name is not
    known.
    Use {'extra'}->{'normalized'} instead of {'extra'}->{'node_content'}
    to determine if th enode is present multiple times, or empty.
    Pass normalized label string and label contents separately to
    node_information_filename, to _normalized_label_id_file and to user
    defined reference label_target_name.
    Add file_info_label_contents with label contents to files_source_info
    for a redirection file.
    Add 'normalized' extra key in Plaintext/Info for nodes or anchors
    created for footnotes.
    Add target_element_to_texi_label to format target element label to
    Texinfo.
    
    * tp/Texinfo/Convert/DocBook.pm (_convert),
    tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): use directly the
    normalized extra key instead of redoing the normalization.
---
 ChangeLog                                          |  44 ++
 doc/texi2any_api.texi                              |  11 +-
 tp/Texinfo/Common.pm                               |  25 +-
 tp/Texinfo/Convert/Converter.pm                    |  45 +-
 tp/Texinfo/Convert/DocBook.pm                      |   8 +-
 tp/Texinfo/Convert/HTML.pm                         |  87 ++--
 tp/Texinfo/Convert/IXIN.pm                         |   5 +-
 tp/Texinfo/Convert/Info.pm                         |  21 +-
 tp/Texinfo/Convert/LaTeX.pm                        |  14 +-
 tp/Texinfo/Convert/NodeNameNormalization.pm        |  14 +-
 tp/Texinfo/Convert/Plaintext.pm                    |  77 ++-
 tp/Texinfo/Convert/Texinfo.pm                      |  13 +
 tp/Texinfo/Convert/TexinfoMarkup.pm                |  20 +-
 tp/Texinfo/ParserNonXS.pm                          |   8 +-
 tp/Texinfo/Structuring.pm                          |  49 +-
 tp/Texinfo/Transformations.pm                      |  38 +-
 tp/Texinfo/XS/parsetexi/end_line.c                 |   4 +-
 tp/Texinfo/XS/parsetexi/labels.c                   |   6 +-
 tp/Texinfo/XS/parsetexi/labels.h                   |   2 +-
 tp/Texinfo/XS/parsetexi/separator.c                |   2 +-
 tp/init/documentation_examples.pm                  |   8 +-
 tp/t/results/conditionals/cond.pl                  |   8 -
 tp/t/results/conditionals/cond_ifhtml_ifinfo.pl    |   8 -
 .../conditionals/cond_ifhtml_ifinfo_iftex.pl       |   8 -
 tp/t/results/conditionals/cond_info.pl             |   8 -
 .../conditionals/cond_info_ifhtml_ifinfo_iftex.pl  |   8 -
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |   8 -
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   8 -
 tp/t/results/conditionals/cond_xml.pl              |   8 -
 .../results/converters_tests/at_commands_in_raw.pl |  12 -
 tp/t/results/converters_tests/combined_fonts.pl    |   8 -
 tp/t/results/converters_tests/complex_nestings.pl  |   8 -
 .../converters_tests/contents_at_document_begin.pl |   8 -
 .../contents_at_document_begin_inline.pl           |   8 -
 .../contents_at_document_begin_separate_element.pl |   8 -
 .../converters_tests/definition_commands.pl        |   8 -
 .../results/converters_tests/footnote_no_number.pl |   8 -
 .../footnote_no_number_separate.pl                 |   8 -
 tp/t/results/converters_tests/form_feeds.pl        |  12 -
 .../converters_tests/frenchspacing_and_code.pl     |  12 -
 tp/t/results/converters_tests/image_formatting.pl  |   8 -
 .../index_entry_in_preformatted.pl                 |   8 -
 .../indices_in_begin_tables_lists.pl               |  12 -
 ...ces_in_begin_tables_lists_entries_after_item.pl |  12 -
 tp/t/results/converters_tests/non_empty_part.pl    |  12 -
 .../non_empty_part_no_top_node_output.pl           |  12 -
 .../printindex_merged_indices_code_style.pl        |   8 -
 tp/t/results/converters_tests/ref_in_sectioning.pl |  12 -
 .../references_to_top_no_top_output.pl             |  40 --
 tp/t/results/converters_tests/refs_formatting.pl   |   4 -
 .../converters_tests/setfilename_no_extension.pl   |   8 -
 .../converters_tests/simplest_test_prefix.pl       |   4 -
 .../some_at_commands_in_ref_nodes.pl               |  34 --
 .../converters_tests/spaces_in_empty_node_names.pl |  10 +-
 .../converters_tests/spaces_in_node_names.pl       |  24 -
 .../converters_tests/test_deftypefnnewline.pl      |   8 -
 .../converters_tests/things_before_setfilename.pl  |  24 -
 .../things_before_setfilename_no_element.pl        |  16 -
 tp/t/results/converters_tests/top_in_ref.pl        |   8 -
 tp/t/results/coverage/block_commands.pl            |   4 -
 .../coverage/punctuation_in_line_commands.pl       |  12 -
 .../coverage_braces/brace_opened_no_command.pl     |   4 -
 .../coverage_braces/contain_plain_text_nestings.pl |   8 -
 tp/t/results/coverage_braces/end_line_in_anchor.pl |   6 -
 .../coverage_braces/form_feed_in_brace_commands.pl |   4 -
 .../coverage_braces/inforef_too_much_args.pl       |   4 -
 tp/t/results/coverage_braces/space_in_anchor.pl    |   4 -
 tp/t/results/coverage_braces/test_image.pl         |  12 -
 .../coverage_braces/two_footnotes_in_nodes.pl      |   8 -
 .../two_footnotes_in_nodes_separate.pl             |   8 -
 tp/t/results/coverage_braces/verb_in_xref.pl       |   4 -
 .../def/all_commands_delimiters_printindex.pl      |   8 -
 tp/t/results/def/all_commands_printindex.pl        |   8 -
 tp/t/results/def/omit_def_space.pl                 |   8 -
 tp/t/results/def/ref_in_def.pl                     |   8 -
 tp/t/results/def/space_in_def_for_index.pl         |   8 -
 .../docbook_tests/between_node_and_section.pl      |  16 -
 .../docbook_tests/multiple_documentlanguage.pl     |  20 -
 .../docbook_tests/special_docbook_unnumbered.pl    |  20 -
 tp/t/results/float/anchor_in_caption.pl            |  16 -
 tp/t/results/float/cindex_in_caption.pl            |  12 -
 .../results/float/comment_space_comand_in_float.pl |  14 -
 tp/t/results/float/complex_float.pl                |  24 -
 tp/t/results/float/empty_caption.pl                |   8 -
 .../float/empty_listoffloats_with_floats.pl        |   8 -
 tp/t/results/float/float_copying.pl                |  20 -
 tp/t/results/float/float_in_block_commands.pl      |  12 -
 tp/t/results/float/float_with_at_commands.pl       |  12 -
 tp/t/results/float/footnote_in_caption.pl          |  12 -
 .../results/float/footnote_in_caption_and_error.pl |  12 -
 .../float/numbering_captions_listoffloats.pl       | 108 -----
 tp/t/results/float/ref_to_float.pl                 |   8 -
 tp/t/results/float/simple.pl                       |   4 -
 .../float/special_characters_in_float_type.pl      |  18 -
 tp/t/results/formats_encodings/accent.pl           |   4 -
 .../formats_encodings/accent_enable_encoding.pl    |   4 -
 tp/t/results/formats_encodings/accentenc.pl        |   4 -
 .../formats_encodings/accentenc_enable_encoding.pl |   4 -
 .../formats_encodings/at_commands_in_refs.pl       | 522 ---------------------
 .../at_commands_in_refs_latin1.pl                  | 522 ---------------------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 522 ---------------------
 .../char_latin1_latin1_in_refs.pl                  |  24 -
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  24 -
 .../char_latin2_latin2_in_refs.pl                  |   8 -
 .../formats_encodings/japanese_shift_jis.pl        |  12 -
 .../manual_simple_latin1_with_error.pl             |  12 -
 .../manual_simple_utf8_with_error.pl               |  12 -
 tp/t/results/formats_encodings/sample_utf8.pl      |  16 -
 tp/t/results/formats_encodings/weird_accents.pl    |   8 -
 .../weird_accents_disable_encoding.pl              |   8 -
 tp/t/results/heading/heading_in_copying.pl         |   8 -
 .../html_tests/acronym_in_node_and_section.pl      |  18 -
 tp/t/results/html_tests/check_htmlxref.pl          |  12 -
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |  12 -
 tp/t/results/html_tests/check_htmlxref_menu.pl     |  12 -
 .../html_tests/check_htmlxref_no_use_nodes.pl      |  12 -
 tp/t/results/html_tests/contents_at_end.pl         |   8 -
 tp/t/results/html_tests/contents_at_end_inline.pl  |   8 -
 .../html_tests/contents_at_end_separate_element.pl |   8 -
 .../html_tests/contents_in_middle_chapter.pl       |  12 -
 .../contents_in_middle_chapter_inline.pl           |  12 -
 .../contents_in_middle_chapter_separate_element.pl |  12 -
 .../html_tests/contents_in_middle_section.pl       |  16 -
 .../contents_in_middle_section_inline.pl           |  16 -
 .../contents_in_middle_section_separate_element.pl |  16 -
 .../deftypefnnewline_for_copying_after.pl          |   8 -
 .../deftypefnnewline_for_copying_before.pl         |   8 -
 tp/t/results/html_tests/double_contents.pl         |  12 -
 .../html_tests/double_contents_after_title.pl      |  12 -
 .../double_contents_after_title_show_title.pl      |  12 -
 ...double_contents_after_title_show_title_nodes.pl |  12 -
 tp/t/results/html_tests/double_contents_book.pl    |  12 -
 tp/t/results/html_tests/double_contents_chapter.pl |  12 -
 tp/t/results/html_tests/double_contents_inline.pl  |  12 -
 .../html_tests/double_contents_inline_chapter.pl   |  12 -
 .../html_tests/double_contents_inline_nodes.pl     |  12 -
 .../html_tests/double_contents_inline_section.pl   |  12 -
 tp/t/results/html_tests/double_contents_nodes.pl   |  12 -
 tp/t/results/html_tests/double_contents_section.pl |  12 -
 .../html_tests/double_contents_separate_element.pl |  12 -
 .../double_contents_separate_element_chapter.pl    |  12 -
 .../double_contents_separate_element_nodes.pl      |  12 -
 .../double_contents_separate_element_section.pl    |  12 -
 .../empty_lines_at_beginning_no_setfilename.pl     |   4 -
 .../file_name_case_insensitive_conflict_node.pl    |  24 -
 ...se_insensitive_conflict_node_no_redirections.pl |  24 -
 ..._name_case_insensitive_conflict_redirections.pl |  12 -
 .../html_tests/file_name_conflict_with_Top.pl      |  12 -
 .../html_tests/file_name_conflict_with_section.pl  |   8 -
 .../file_name_conflict_with_user_defined.pl        |  16 -
 .../html_tests/filenameconflictwithnonsplit.pl     |   8 -
 .../filenameconflictwithspecialelement.pl          |  12 -
 tp/t/results/html_tests/float_copying.pl           |  20 -
 ...otnotestyle_separate_html_text_no_monolithic.pl |   8 -
 .../html_tests/footnotestyle_separate_late.pl      |  12 -
 tp/t/results/html_tests/html_in_copying.pl         |   4 -
 .../results/html_tests/index_and_node_same_name.pl |   4 -
 tp/t/results/html_tests/no_content.pl              |   8 -
 tp/t/results/html_tests/no_content_do_contents.pl  |   8 -
 .../html_tests/no_content_do_contents_inline.pl    |   8 -
 .../no_content_do_contents_separate_element.pl     |   8 -
 tp/t/results/html_tests/no_content_inline.pl       |   8 -
 .../html_tests/no_content_separate_element.pl      |   8 -
 tp/t/results/html_tests/node_footnote_end.pl       |  20 -
 tp/t/results/html_tests/node_footnote_separated.pl |  20 -
 tp/t/results/html_tests/node_footnote_use_node.pl  |  20 -
 .../html_tests/node_footnote_use_node_separate.pl  |  20 -
 tp/t/results/html_tests/redirection_same_labels.pl |  24 -
 tp/t/results/html_tests/ref_in_preformatted.pl     |   8 -
 tp/t/results/html_tests/sectioning_frames.pl       |  56 ---
 tp/t/results/html_tests/shorttitlepage.pl          |   4 -
 tp/t/results/html_tests/simple_menu.pl             |   4 -
 tp/t/results/html_tests/simple_menu_in_example.pl  |   4 -
 .../html_tests/simplest_test_date_in_header.pl     |   4 -
 tp/t/results/html_tests/split_html_text.pl         |   8 -
 tp/t/results/html_tests/test_accents_sc_default.pl |   8 -
 .../html_tests/test_accents_sc_default_latin1.pl   |   8 -
 .../html_tests/test_accents_sc_default_usascii.pl  |   8 -
 .../html_tests/test_accents_sc_enable_encoding.pl  |   8 -
 .../test_accents_sc_enable_encoding_latin1.pl      |   8 -
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |   8 -
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |   8 -
 .../test_accents_sc_enable_encoding_usascii.pl     |   8 -
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |   8 -
 .../test_accents_sc_use_numeric_entity.pl          |   8 -
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   8 -
 .../test_xrefautomaticsectiontitle_off_first.pl    |   8 -
 .../text_before_top_and_contents_after_title.pl    |   4 -
 ...t_before_top_and_summarycontents_after_title.pl |   4 -
 tp/t/results/html_tests/titles.pl                  |   4 -
 tp/t/results/html_tests/top_node_up_explicit.pl    |   8 -
 .../html_tests/top_node_up_explicit_no_nodes.pl    |   8 -
 tp/t/results/html_tests/top_node_up_implicit.pl    |   8 -
 .../html_tests/top_node_up_implicit_no_nodes.pl    |   8 -
 .../html_tests/transliterated_names_conflicts.pl   |  20 -
 tp/t/results/htmlxref/htmlxref.pl                  |  20 -
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  20 -
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  20 -
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  20 -
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  20 -
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  20 -
 tp/t/results/include/cpp_line_latin1.pl            |   8 -
 tp/t/results/include/cpp_lines.pl                  |   8 -
 .../macro_and_commands_in_early_commands.pl        |   8 -
 tp/t/results/include/macro_in_early_commands.pl    |   8 -
 tp/t/results/include/value_expansion_in_include.pl |   8 -
 tp/t/results/indices/complex_recursive_synindex.pl |   8 -
 tp/t/results/indices/def_syn_indices.pl            |   8 -
 ...default_cp_index_and_one_letter_syncodeindex.pl |   8 -
 tp/t/results/indices/double_index_entry.pl         |   8 -
 tp/t/results/indices/double_seeentry_seealso.pl    |   8 -
 tp/t/results/indices/double_syncodeindex.pl        |   8 -
 tp/t/results/indices/empty_cindex_entry.pl         |   8 -
 tp/t/results/indices/empty_index_entry.pl          |   8 -
 tp/t/results/indices/empty_string_index_entry.pl   |   8 -
 tp/t/results/indices/encoding_index_ascii.pl       |   8 -
 .../encoding_index_ascii_enable_encoding.pl        |   8 -
 tp/t/results/indices/encoding_index_latin1.pl      |   8 -
 .../encoding_index_latin1_enable_encoding.pl       |   8 -
 tp/t/results/indices/encoding_index_utf8.pl        |   8 -
 .../indices/encoding_index_utf8_enable_encoding.pl |   8 -
 tp/t/results/indices/explicit_sort_key.pl          |   8 -
 tp/t/results/indices/ftable_vtable.pl              |   8 -
 .../indices/ignored_sort_char_empty_entries.pl     |   8 -
 tp/t/results/indices/image_lines_count.pl          | Bin 6821 -> 6612 bytes
 tp/t/results/indices/image_text_lines_count.pl     | Bin 7296 -> 7077 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |   8 -
 tp/t/results/indices/index_entries_before_nodes.pl |   8 -
 tp/t/results/indices/index_entries_locations.pl    |   8 -
 .../indices/index_entry_before_first_node.pl       | Bin 7135 -> 6902 bytes
 tp/t/results/indices/index_entry_before_node.pl    |  12 -
 tp/t/results/indices/index_entry_in_footnote.pl    | Bin 8160 -> 7939 bytes
 .../index_entry_in_footnote_different_node_end.pl  |  12 -
 .../indices/index_entry_in_footnote_sections.pl    |   8 -
 .../index_entry_in_footnote_sections_separate.pl   |   8 -
 .../indices/index_entry_in_footnote_separate.pl    |  12 -
 tp/t/results/indices/index_nodes.pl                |  20 -
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  20 -
 tp/t/results/indices/index_special_region.pl       |  24 -
 .../index_special_region_no_insertcopying.pl       |  24 -
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  24 -
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  24 -
 ...copying_titlepage_no_nodes_footnotes_default.pl |  24 -
 .../index_special_region_no_titlepage_no_nodes.pl  |  24 -
 .../index_special_region_titlepage_no_nodes.pl     |  24 -
 ..._region_titlepage_no_nodes_footnotes_default.pl |  24 -
 tp/t/results/indices/index_split.pl                |  44 --
 .../indices/index_split_split_chapter_no_nodes.pl  |  44 --
 tp/t/results/indices/index_table.pl                |  20 -
 .../results/indices/index_table_chapter_no_node.pl |  20 -
 .../multiple_index_text_sortas_seeentry_seealso.pl |   8 -
 tp/t/results/indices/nodes_before_top.pl           |  28 --
 .../nodes_before_top_and_sections_chapter.pl       |  36 --
 ...odes_before_top_and_sections_chapter_no_node.pl |  36 --
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  36 --
 .../indices/nodes_before_top_split_chapter.pl      |  28 --
 .../nodes_before_top_split_chapter_no_nodes.pl     |  28 --
 tp/t/results/indices/print_merged_index.pl         |   8 -
 .../indices/printindex_between_node_section.pl     |  12 -
 .../indices/printindex_between_part_chapter.pl     |  12 -
 .../indices/printindex_index_entry_in_copying.pl   |   8 -
 ...rintindex_index_entry_in_copying_in_footnote.pl |   8 -
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   8 -
 .../indices/printindex_with_space_before.pl        | Bin 8494 -> 8032 bytes
 .../indices/same_index_entry_merged_indices.pl     |   8 -
 tp/t/results/indices/same_only_seealso_seeentry.pl |   8 -
 tp/t/results/indices/same_seealso_seeentry.pl      |   8 -
 tp/t/results/indices/seealso_duplicate.pl          |   8 -
 tp/t/results/indices/seeentry.pl                   |   8 -
 tp/t/results/indices/sorted_subentries.pl          |  12 -
 tp/t/results/indices/split_chapter_index.pl        |  16 -
 tp/t/results/indices/subentries.pl                 |   8 -
 tp/t/results/indices/subentry_and_sortas.pl        |   8 -
 tp/t/results/indices/subentry_and_sortas_spaces.pl |   8 -
 tp/t/results/indices/syncode_index_print_both.pl   |   8 -
 tp/t/results/indices/syncodeindex_to_plain.pl      |   8 -
 tp/t/results/indices/transparent_sort_chars.pl     |   8 -
 tp/t/results/indices/w_lines_count.pl              |   4 -
 tp/t/results/info_tests/anchor_and_spaces.pl       |  16 -
 tp/t/results/info_tests/anchor_in_command.pl       |   8 -
 tp/t/results/info_tests/before_node_and_section.pl |  12 -
 tp/t/results/info_tests/center_flush.pl            |  12 -
 tp/t/results/info_tests/colon_in_index_entry.pl    |   4 -
 .../info_tests/colons_in_index_entries_and_node.pl |  20 -
 .../colons_in_index_entries_and_node_no_quoting.pl |  20 -
 tp/t/results/info_tests/def_in_copying.pl          |   4 -
 tp/t/results/info_tests/direntry_dircategory.pl    |   8 -
 .../direntry_dircategory_and_commands.pl           |   4 -
 tp/t/results/info_tests/empty_caption.pl           |   8 -
 tp/t/results/info_tests/encoding_us_ascii.pl       |   4 -
 .../end_of_line_command_in_node_lines.pl           |  28 --
 tp/t/results/info_tests/error_in_footnote.pl       |   8 -
 tp/t/results/info_tests/file_only_png.pl           | Bin 4241 -> 4040 bytes
 tp/t/results/info_tests/float_long_captions.pl     |  12 -
 tp/t/results/info_tests/float_without_type.pl      |   4 -
 tp/t/results/info_tests/image_and_punctuation.pl   | Bin 8140 -> 7923 bytes
 .../info_tests/image_and_spaces_formatting.pl      |   4 -
 tp/t/results/info_tests/image_extension.pl         | Bin 5349 -> 5144 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      | Bin 3694 -> 3483 bytes
 tp/t/results/info_tests/image_not_found.pl         |   4 -
 tp/t/results/info_tests/image_quotes.pl            | Bin 3254 -> 3055 bytes
 .../info_tests/image_text_file_only_and_alt.pl     | Bin 3442 -> 3211 bytes
 tp/t/results/info_tests/index_entry_at_end_node.pl |  12 -
 .../info_tests/invalid_node_name_no_warning.pl     |  20 -
 .../info_tests/invalid_node_name_warning.pl        |  20 -
 tp/t/results/info_tests/known_encoding.pl          |   4 -
 .../multitable_anchor_and_index_entry.pl           |  12 -
 .../info_tests/nested_footnotes_separate.pl        |   4 -
 .../info_tests/nested_multitable_anchor_index.pl   |  12 -
 tp/t/results/info_tests/no_top_node.pl             |   4 -
 tp/t/results/info_tests/note_in_strong.pl          |   4 -
 .../info_tests/note_in_strong_end_of_line.pl       |   4 -
 tp/t/results/info_tests/novalidate_empty_refs.pl   |   4 -
 .../info_tests/one_node_counted_elements.pl        |   8 -
 .../info_tests/paragraphindent_and_preamble.pl     |   4 -
 .../paragraphindent_in_preamble_and_in_document.pl |   4 -
 .../info_tests/paragraphindent_not_in_preamble.pl  |   4 -
 tp/t/results/info_tests/pxref_test.pl              |   4 -
 tp/t/results/info_tests/quote_node_names_info.pl   |  24 -
 tp/t/results/info_tests/ref_tests.pl               |   4 -
 tp/t/results/info_tests/space_at_menu_end.pl       |   4 -
 tp/t/results/info_tests/space_in_menu.pl           |   8 -
 tp/t/results/info_tests/space_in_setfilename.pl    |   4 -
 tp/t/results/info_tests/split_no_copying.pl        |   8 -
 tp/t/results/info_tests/split_nocopying.pl         |   8 -
 tp/t/results/info_tests/split_nocopying_split.pl   |   8 -
 .../info_tests/split_test_before_first_node.pl     |   8 -
 .../split_test_before_first_node_no_empty_line.pl  |   8 -
 tp/t/results/info_tests/test_index.pl              |  16 -
 tp/t/results/info_tests/text_before_node.pl        |   8 -
 tp/t/results/info_tests/top_node_normalization.pl  |   4 -
 .../info_tests/two_paragraphindent_in_preamble.pl  |   4 -
 ..._paragraphindent_in_preamble_and_in_document.pl |   4 -
 tp/t/results/info_tests/unknown_encoding.pl        |   4 -
 tp/t/results/info_tests/xref_test.pl               |   4 -
 .../init_files_tests/customize_special_element.pl  |  12 -
 .../init_files_tests/customize_translations.pl     |  24 -
 .../init_files_tests/documentation_examples.pl     |  12 -
 .../init_files_tests/undefined_node_filename.pl    |   8 -
 tp/t/results/invalid_nestings/accents.pl           |   4 -
 tp/t/results/invalid_nestings/center.pl            |   4 -
 .../invalid_nestings/float_in_style_command.pl     |   4 -
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |   4 -
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |   4 -
 tp/t/results/invalid_nestings/ignored_text.pl      |   4 -
 tp/t/results/invalid_nestings/in_errormsg.pl       |   8 -
 tp/t/results/invalid_nestings/in_table.pl          |  12 -
 .../invalid_nestings/menu_in_style_command.pl      |   4 -
 tp/t/results/invalid_nestings/node_in_copying.pl   |   4 -
 .../invalid_nestings/node_in_copying_not_closed.pl |   4 -
 .../invalid_nestings/node_on_index_entry_line.pl   |   4 -
 .../invalid_nestings/on_block_command_line.pl      |   8 -
 tp/t/results/invalid_nestings/on_def_line.pl       |   8 -
 .../invalid_nestings/on_index_entry_line.pl        |   4 -
 tp/t/results/invalid_nestings/on_itemize_line.pl   |   4 -
 tp/t/results/invalid_nestings/on_node_line.pl      |   8 -
 tp/t/results/invalid_nestings/on_section_line.pl   |   4 -
 .../results/invalid_nestings/on_subheading_line.pl |   4 -
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |   4 -
 tp/t/results/invalid_nestings/ref_in_ref.pl        |   4 -
 .../invalid_nestings/ref_to_top_in_anchor.pl       |  10 -
 .../invalid_nestings/section_on_float_line.pl      |   4 -
 .../style_not_closed_before_first_node.pl          |   4 -
 .../style_not_closed_no_newline_root_commands.pl   |   8 -
 .../style_not_closed_root_commands.pl              |   8 -
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |   4 -
 .../itemize/inter_item_commands_in_enumerate.pl    |   8 -
 .../itemize/inter_item_commands_in_itemize.pl      |   8 -
 tp/t/results/languages/appendix_translated.pl      |   4 -
 tp/t/results/languages/command_translated.pl       |  10 -
 tp/t/results/languages/documentlanguage.pl         |   8 -
 tp/t/results/languages/documentlanguage_option.pl  |   8 -
 tp/t/results/languages/documentlanguage_unknown.pl |   8 -
 .../results/languages/multiple_documentlanguage.pl |   8 -
 tp/t/results/languages/multiple_in_preamble.pl     |   8 -
 .../languages/multiple_in_preamble_before_node.pl  |   8 -
 tp/t/results/languages/multiple_lang_chapters.pl   |  24 -
 .../languages/multiple_lang_chapters_latex.pl      |  24 -
 .../languages/multiple_lang_chapters_texi2html.pl  |  24 -
 tp/t/results/languages/simple_documentlanguage.pl  |   8 -
 tp/t/results/languages/unknown_language.pl         |   8 -
 tp/t/results/languages/unknown_region.pl           |   8 -
 tp/t/results/latex_tests/anchor_before_top.pl      |  12 -
 tp/t/results/latex_tests/anchor_in_copying.pl      |  12 -
 .../anchor_in_copying_insertcopying_chap.pl        |  12 -
 .../anchor_in_copying_insertcopying_titlepage.pl   |  16 -
 ...chor_in_copying_insertcopying_titlepage_chap.pl |  12 -
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  32 --
 .../latex_tests/custom_heading_with_include.pl     |  24 -
 .../custom_heading_with_include_in_command.pl      |  24 -
 tp/t/results/latex_tests/custom_headings.pl        |   8 -
 .../latex_tests/error_in_sectioning_command.pl     |  14 -
 tp/t/results/latex_tests/float_and_refs.pl         |  20 -
 tp/t/results/latex_tests/fonttextsize.pl           |   8 -
 tp/t/results/latex_tests/indices.pl                |   8 -
 .../latex_tests/indices_disable_encoding.pl        |   8 -
 .../informative_commands_in_top_node.pl            |   8 -
 tp/t/results/latex_tests/node_before_top.pl        |  12 -
 tp/t/results/latex_tests/pagesizes.pl              |   8 -
 tp/t/results/latex_tests/pagetype.pl               |   8 -
 tp/t/results/latex_tests/shorttitlepage.pl         |   8 -
 tp/t/results/latex_tests/titlepage_classical.pl    |   8 -
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |   8 -
 tp/t/results/latex_tests/titlepage_long_title.pl   |   8 -
 tp/t/results/latex_tests/titlepage_no_author.pl    |   8 -
 tp/t/results/latex_tests/titlepage_no_title.pl     |   8 -
 .../titlepage_with_commands_classical.pl           |   8 -
 .../latex_tests/top_no_sectioning_command.pl       |   8 -
 tp/t/results/layout/navigation.pl                  |  16 -
 tp/t/results/layout/navigation_chapter.pl          |  16 -
 .../results/layout/navigation_chapter_no_header.pl |  16 -
 .../navigation_chapter_no_header_vertical.pl       |  16 -
 tp/t/results/layout/navigation_chapter_vertical.pl |  16 -
 tp/t/results/layout/navigation_no_header.pl        |  16 -
 .../layout/navigation_no_header_vertical.pl        |  16 -
 tp/t/results/layout/navigation_node.pl             |  16 -
 tp/t/results/layout/navigation_node_no_header.pl   |  16 -
 .../layout/navigation_node_no_header_vertical.pl   |  16 -
 tp/t/results/layout/navigation_node_vertical.pl    |  16 -
 tp/t/results/layout/navigation_section.pl          |  16 -
 .../results/layout/navigation_section_no_header.pl |  16 -
 .../navigation_section_no_header_vertical.pl       |  16 -
 tp/t/results/layout/navigation_section_vertical.pl |  16 -
 .../layout/navigation_test_misc_file_collision.pl  |  16 -
 tp/t/results/layout/navigation_vertical.pl         |  16 -
 tp/t/results/layout/no_monolithic.pl               |   8 -
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |   8 -
 tp/t/results/macro/backslash_in_arg.pl             |   8 -
 tp/t/results/macro/bib_example.pl                  |  16 -
 tp/t/results/macro/glossary.pl                     |  12 -
 tp/t/results/macro/macro_in_index_commands.pl      |   8 -
 tp/t/results/macro/macro_in_misc_commands.pl       |   8 -
 .../menu/block_commands_in_menu_description.pl     |   4 -
 tp/t/results/menu/comment_on_menu_line.pl          |   8 -
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  24 -
 tp/t/results/menu/detailmenu_unknown_node.pl       |   4 -
 .../menu/direntry_dircategory_after_first_node.pl  |   4 -
 tp/t/results/menu/empty_menu_description.pl        |   4 -
 tp/t/results/menu/empty_menu_entry_name.pl         |   8 -
 tp/t/results/menu/entry_after_detailmenu.pl        |  12 -
 tp/t/results/menu/example_in_menu_description.pl   |   4 -
 tp/t/results/menu/formats_in_menu.pl               |   4 -
 tp/t/results/menu/inlineraw_in_menu_description.pl |   4 -
 tp/t/results/menu/invalid_info_menu_entry.pl       |   4 -
 tp/t/results/menu/menu_in_deffn.pl                 |   4 -
 tp/t/results/menu/menu_in_example.pl               |   4 -
 tp/t/results/menu/menu_node_unterminated.pl        |   4 -
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   8 -
 tp/t/results/menu/menu_title_before_entries.pl     |   8 -
 .../results/menu/missing_detailmenu_on_subnodes.pl |  24 -
 tp/t/results/menu/multiple_menus.pl                |   4 -
 tp/t/results/menu/no_colon_in_menu.pl              |   4 -
 tp/t/results/menu/reference_to_external_manual.pl  |   4 -
 tp/t/results/menu/sc_in_menu.pl                    |   8 -
 .../menu/space_and_commands_in_menu_node.pl        |  12 -
 tp/t/results/menu/submenu_in_example.pl            |   4 -
 tp/t/results/menu/verb_in_menu_description.pl      |   4 -
 .../codequoteundirected_codequotebacktick.pl       |   8 -
 .../misc_commands/comment_space_command_on_line.pl |  12 -
 tp/t/results/misc_commands/ref_in_center.pl        |   8 -
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  24 -
 .../misc_commands/text_before_line_command.pl      |   4 -
 tp/t/results/moresectioning/anchor_in_footnote.pl  |  12 -
 .../moresectioning/anchor_in_footnote_separate.pl  |  12 -
 .../moresectioning/character_and_spaces_in_refs.pl |  24 -
 .../character_and_spaces_in_refs_out.pl            |  24 -
 tp/t/results/moresectioning/complex.pl             |  60 ---
 .../moresectioning/complex_split_at_node.pl        |  60 ---
 .../contents_at_begin_chapter_without_node.pl      |   4 -
 .../moresectioning/contents_at_end_document.pl     |   4 -
 .../contents_at_end_document_after_node.pl         |   8 -
 .../results/moresectioning/contents_in_document.pl |   4 -
 tp/t/results/moresectioning/empty_top_node_up.pl   |   8 -
 .../equivalent_nodes_defined_linked.pl             |   8 -
 .../results/moresectioning/internal_top_node_up.pl |   8 -
 .../moresectioning/lowered_subsubsection.pl        |  28 --
 .../moresectioning/more_sections_than_nodes.pl     |  20 -
 tp/t/results/moresectioning/no_element.pl          |  12 -
 .../moresectioning/nodes_before_after_top_xref.pl  |  16 -
 .../non_automatic_internal_top_node_up.pl          |   8 -
 .../non_automatic_top_node_up_and_url.pl           |   8 -
 .../non_automatic_top_node_up_url.pl               |   8 -
 .../moresectioning/only_special_spaces_node.pl     |  20 -
 .../moresectioning/placed_things_before_element.pl |  12 -
 .../moresectioning/placed_things_before_node.pl    |  20 -
 tp/t/results/moresectioning/raiselowersections.pl  |  24 -
 tp/t/results/moresectioning/rec_nodes.pl           |  20 -
 .../moresectioning/section_in_unnumbered_info.pl   | 128 -----
 .../section_in_unnumbered_plaintext.pl             | 128 -----
 .../moresectioning/special_spaces_in_nodes.pl      |  40 --
 tp/t/results/moresectioning/top_node_up_url.pl     |   8 -
 tp/t/results/moresectioning/topic_guide.pl         |  32 --
 tp/t/results/paragraph/commands_in_flushright.pl   |   4 -
 tp/t/results/plaintext_tests/all_spaces.pl         |   8 -
 .../plaintext_tests/anchor_and_empty_lines.pl      |   4 -
 .../at_commands_glued_in_example.pl                |   4 -
 .../at_commands_glued_in_paragraph.pl              |   4 -
 .../plaintext_tests/chinese_mixed_with_en.pl       |   8 -
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  12 -
 .../plaintext_tests/line_passed_and_formats.pl     |   4 -
 tp/t/results/plaintext_tests/non_break_spaces.pl   |   4 -
 .../punctuation_sc_accents_ascii_glyph.pl          |   8 -
 .../punctuation_sc_accents_ascii_glyph_latin1.pl   |   8 -
 .../punctuation_sc_accents_ascii_glyph_usascii.pl  |   8 -
 .../punctuation_sc_accents_default.pl              |   8 -
 .../punctuation_sc_accents_default_latin1.pl       |   8 -
 .../punctuation_sc_accents_default_usascii.pl      |   8 -
 .../punctuation_sc_accents_disable_encoding.pl     |   8 -
 ...nctuation_sc_accents_disable_encoding_latin1.pl |   8 -
 ...ctuation_sc_accents_disable_encoding_usascii.pl |   8 -
 ...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl |   8 -
 ...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl |   8 -
 .../punctuation_sc_accents_to_utf8_latin1.pl       |   8 -
 .../punctuation_sc_accents_to_utf8_usascii.pl      |   8 -
 tp/t/results/plaintext_tests/quote_node_names.pl   |  24 -
 .../example_invalid_at_commands_arguments.pl       |   4 -
 tp/t/results/regions/anchor_in_copying.pl          |  12 -
 .../regions/anchor_in_copying_in_footnote.pl       |  12 -
 tp/t/results/regions/anchor_in_titlepage.pl        |  12 -
 .../regions/anchor_in_titlepage_titlepage.pl       |  12 -
 tp/t/results/regions/format_in_titlepage.pl        |   8 -
 .../regions/format_in_titlepage_titlepage.pl       |   8 -
 tp/t/results/regions/ref_in_copying.pl             |   8 -
 .../regions/ref_in_copying_insert_in_chapter.pl    |  12 -
 tp/t/results/regions/today_in_copying.pl           |   8 -
 tp/t/results/sectioning/a_comma_after_node.pl      |   4 -
 tp/t/results/sectioning/anchor_zero.pl             |   8 -
 tp/t/results/sectioning/at_commands_in_node.pl     |  30 --
 .../sectioning/automatic_menu_referencing_node.pl  |  12 -
 tp/t/results/sectioning/chapter_between_nodes.pl   |   8 -
 .../chapter_between_nodes_with_appendix.pl         |   8 -
 .../chapter_between_nodes_with_appendix_nomenu.pl  |   8 -
 .../chapter_node_before_and_after_part.pl          |   8 -
 .../sectioning/character_and_spaces_in_node.pl     |  20 -
 tp/t/results/sectioning/contents_and_parts.pl      |  16 -
 .../sectioning/contents_with_only_top_node.pl      |   4 -
 .../results/sectioning/double_node_anchor_float.pl |  12 -
 tp/t/results/sectioning/double_part.pl             |   8 -
 ...double_recursive_self_section_node_reference.pl |  14 -
 .../double_recursive_self_section_reference.pl     |   8 -
 tp/t/results/sectioning/double_top.pl              |   4 -
 tp/t/results/sectioning/double_top_in_menu.pl      |   4 -
 tp/t/results/sectioning/email_in_node.pl           |  12 -
 tp/t/results/sectioning/empty_ref_arg.pl           |   4 -
 tp/t/results/sectioning/equivalent_labels.pl       |  12 -
 tp/t/results/sectioning/equivalent_nodes.pl        |   8 -
 .../results/sectioning/explicit_node_directions.pl |  12 -
 tp/t/results/sectioning/external_node_in_menu.pl   |  12 -
 .../in_menu_only_special_ascii_spaces_node.pl      |   4 -
 .../in_menu_only_special_ascii_spaces_node_menu.pl |   4 -
 .../sectioning/in_menu_only_special_spaces_node.pl |  20 -
 .../in_menu_only_special_spaces_node_menu.pl       |  20 -
 tp/t/results/sectioning/lone_Top_node.pl           |   8 -
 tp/t/results/sectioning/loop_nodes.pl              |  16 -
 tp/t/results/sectioning/menutextorder.pl           |  28 --
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  16 -
 tp/t/results/sectioning/next_no_prev_to_node.pl    |  12 -
 tp/t/results/sectioning/no_menu.pl                 |  16 -
 tp/t/results/sectioning/node_empty_direction.pl    |   4 -
 tp/t/results/sectioning/node_line_arguments.pl     |  32 --
 tp/t/results/sectioning/node_nested_parentheses.pl |   4 -
 .../sectioning/node_part_chapter_after_chapter.pl  |  12 -
 .../sectioning/node_part_chapter_after_top.pl      |   8 -
 tp/t/results/sectioning/node_referenced_in_ref.pl  |  12 -
 .../node_sectop_before_chapter_no_node.pl          |   4 -
 .../sectioning/node_sectop_before_lone_node_Top.pl |  12 -
 tp/t/results/sectioning/node_simple.pl             |   4 -
 tp/t/results/sectioning/node_too_much_args.pl      |   4 -
 .../node_up_direction_for_top_with_manual.pl       |   4 -
 tp/t/results/sectioning/node_up_external_node.pl   |   8 -
 tp/t/results/sectioning/nodename_parentheses.pl    |  32 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  12 -
 .../nodes_after_top_before_chapter_not_split.pl    |  12 -
 ...ore_chapter_not_split_no_use_node_directions.pl |  12 -
 .../nodes_after_top_before_chapter_sections.pl     |  12 -
 .../nodes_after_top_before_chapter_texi2html.pl    |  12 -
 ...p_before_chapter_texi2html_use_nodes_chapter.pl |  12 -
 .../nodes_after_top_before_section_nodes.pl        |  12 -
 .../nodes_after_top_before_section_sections.pl     |  12 -
 ...s_after_top_before_section_texi2html_chapter.pl |  12 -
 ...after_top_before_section_texi2html_use_nodes.pl |  12 -
 ...p_before_section_texi2html_use_nodes_chapter.pl |  12 -
 tp/t/results/sectioning/nodes_before_after_top.pl  |  16 -
 tp/t/results/sectioning/nodes_before_top.pl        |  16 -
 .../nodes_no_node_top_explicit_directions.pl       |   8 -
 tp/t/results/sectioning/novalidate.pl              |   4 -
 .../one_node_explicit_directions_anchor.pl         |   8 -
 tp/t/results/sectioning/one_subsection_and_node.pl |   4 -
 tp/t/results/sectioning/part_chapter_after_top.pl  |   8 -
 tp/t/results/sectioning/part_node_after_top.pl     |   8 -
 tp/t/results/sectioning/part_node_before_top.pl    |   8 -
 .../sectioning/part_node_chapter_after_top.pl      |  12 -
 .../sectioning/part_node_chapter_appendix.pl       |   8 -
 .../sectioning/part_node_chapter_node_appendix.pl  |  12 -
 .../sectioning/part_node_node_part_appendix.pl     |  12 -
 tp/t/results/sectioning/part_node_part_appendix.pl |   8 -
 .../sectioning/part_node_part_node_appendix.pl     |  12 -
 .../sectioning/protected_node_parentheses.pl       |  16 -
 .../sectioning/recursive_self_section_reference.pl |   4 -
 tp/t/results/sectioning/ref_to_top.pl              |   4 -
 .../reference_to_only_special_spaces_node.pl       |   8 -
 .../sectioning/section_before_after_top_node.pl    |   4 -
 .../section_before_after_top_node_last_node.pl     |   8 -
 tp/t/results/sectioning/section_before_top.pl      |   8 -
 .../results/sectioning/section_below_unnumbered.pl |  12 -
 .../sectioning/section_chapter_before_top_nodes.pl |  12 -
 .../results/sectioning/section_node_before_part.pl |   4 -
 tp/t/results/sectioning/semi_auto.pl               |  16 -
 .../setfilename_on_top_and_after_node.pl           |   4 -
 tp/t/results/sectioning/space_in_node.pl           |  16 -
 .../sectioning/split_for_format_not_split.pl       |   4 -
 .../results/sectioning/top_no_argument_and_node.pl |   4 -
 .../sectioning/top_no_argument_and_top_node.pl     |   4 -
 .../sectioning/top_node_no_menu_direction.pl       |   8 -
 tp/t/results/sectioning/top_node_part_top.pl       |   4 -
 tp/t/results/sectioning/top_without_node_nodes.pl  |   4 -
 .../sectioning/top_without_node_sections.pl        |   4 -
 .../transliterated_split_equivalent_nodes.pl       |  16 -
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  16 -
 .../sectioning/two_nodes_between_chapters.pl       |  16 -
 tp/t/results/sectioning/unknown_node_in_menu.pl    |   4 -
 .../sectioning/unnumbered_before_node_top_top.pl   |   4 -
 .../sectioning/unnumbered_before_top_node.pl       |   4 -
 .../unnumbered_top_without_node_nodes.pl           |   8 -
 .../unnumbered_top_without_node_sections.pl        |   8 -
 ...dex_entries_relate_to_item_no_transformation.pl |   8 -
 .../index_entries_relate_to_item_transformation.pl |   8 -
 tp/t/results/transformations/master_menu_fr.pl     |  12 -
 tp/t/results/value/value_in_index_commands.pl      |   8 -
 tp/t/results/value/value_in_misc_commands.pl       |   8 -
 tp/t/results/value/value_in_node.pl                |  12 -
 tp/t/results/value/value_node_directions.pl        |  12 -
 tp/t/results/xml_tests/commands_and_spaces.pl      |   8 -
 tp/t/results/xml_tests/comments_end_lines.pl       |   4 -
 .../xml_tests/comments_on_block_command_lines.pl   |   4 -
 tp/t/results/xml_tests/image_inline_or_not.pl      |  12 -
 tp/t/results/xml_tests/top_node_and_bye.pl         |   4 -
 tp/t/results/xml_tests/top_node_no_section.pl      |   4 -
 tp/t/results/xtable/block_commands_in_table.pl     |   8 -
 .../results/xtable/inter_item_commands_in_table.pl |   8 -
 640 files changed, 303 insertions(+), 8742 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fdaa269924..7c8995c31b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2023-02-26  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (register_label, get_label_element),
+       tp/Texinfo/Convert/Converter.pm (node_information_filename)
+       (_set_tree_units_files, sort_element_counts),
+       tp/Texinfo/Convert/HTML.pm (command_text, _normalized_label_id_file)
+       (_set_root_commands_targets_node_files, _external_node_href, output),
+       tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Info.pm (output)
+       (format_node), tp/Texinfo/Convert/LaTeX.pm (_convert),
+       tp/Texinfo/Convert/NodeNameNormalization.pm (set_nodes_list_labels),
+       tp/Texinfo/Convert/Plaintext.pm (process_footnotes, node_line)
+       (_convert), tp/Texinfo/Convert/Texinfo.pm
+       (target_element_to_texi_label), tp/Texinfo/Convert/TexinfoMarkup.pm
+       (_convert), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line)
+       (_end_line_starting_block, _process_remaining_on_line),
+       tp/Texinfo/Structuring.pm (_check_node_same_texinfo_code)
+       (_check_menu_entry, check_nodes_are_referenced)
+       (complete_node_tree_with_menus, nodes_tree)
+       (associate_internal_references, number_floats, new_node_menu_entry),
+       tp/Texinfo/Transformations.pm (_new_node),
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block)
+       (end_line_misc_line), tp/Texinfo/XS/parsetexi/labels.c
+       (register_label), tp/Texinfo/XS/parsetexi/separator.c
+       (handle_close_brace), tp/init/documentation_examples.pm: do not
+       register the label element in register_label, instead use directly
+       arguments, first argument of node or anchor, second argument of float,
+       possibly using get_label_element when the element command name is not
+       known.
+       Use {'extra'}->{'normalized'} instead of {'extra'}->{'node_content'}
+       to determine if th enode is present multiple times, or empty.
+       Pass normalized label string and label contents separately to
+       node_information_filename, to _normalized_label_id_file and to user
+       defined reference label_target_name.
+       Add file_info_label_contents with label contents to files_source_info
+       for a redirection file.
+       Add 'normalized' extra key in Plaintext/Info for nodes or anchors
+       created for footnotes.
+       Add target_element_to_texi_label to format target element label to
+       Texinfo.
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert),
+       tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): use directly the
+       normalized extra key instead of redoing the normalization.
+
 2023-02-26  Gavin Smith <gavinsmith0123@gmail.com>
 
        ASCII_GLYPH in tests
diff --git a/doc/texi2any_api.texi b/doc/texi2any_api.texi
index c8e3347118..8e49329bdb 100644
--- a/doc/texi2any_api.texi
+++ b/doc/texi2any_api.texi
@@ -1930,10 +1930,9 @@ The following function reference is for target items 
(nodes, anchors,
 floats):
 
 @deftypefn {Function Reference} @var{$target} label_target_name @
-           (@var{$converter}, @var{\%label_info}, @var{$default_target})
-@var{$converter} is a converter object.  @var{\%label_info} is a hash
-reference containing a @code{normalized} key with value the
-normalized node name, a @code{node_content} key with value a reference on an
+           (@var{$converter}, @var{$normalized}, @var{\@@node_contents}, 
@var{$default_target})
+@var{$converter} is a converter object.  @var{$normalized} is the
+normalized node name, @var{\@@node_contents} is a reference on an
 array containing the Texinfo tree contents of the command label.
 @var{$default_target} is the target that has been already set.  The function
 should return the target (@var{$target}).
@@ -1943,8 +1942,8 @@ The element corresponding to the label can be found with 
@code{label_command}
 (@pxref{Target Commands Links@comma{} Texts and Associated Commands}):
 @example
 my $element;
-$element = $converter->label_command($label_info->@{'normalized'@})
-  if (defined($label_info->@{'normalized'@}));
+$element = $converter->label_command($normalized)
+  if (defined($normalized));
 @end example
 
 For sectioning commands, in addition to the sectioning command target,
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index a4f7382d8a..52336313b1 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1007,7 +1007,7 @@ sub _count_opened_tree_braces($$)
 # typically to replace $LABEL_CONTENTS_CONTAINER->{'contents'}
 # for consistency.
 #
-# Could be documented, but only is there is evidence that this function
+# Could be documented, but only if there is evidence that this function
 # is useful in user-defined code.
 sub parse_node_manual($)
 {
@@ -2280,21 +2280,26 @@ sub relate_index_entries_to_table_items_in_tree($)
 #
 # $TARGET_ELEMENTS_LIST array reference for elements associated to a label
 # $TARGET_ELEMENT is the tree element associated to the label.
-# $LABEL is a hash reference with 'node_content' key and an array of
-#    Texinfo content in it, corresponding to the target label.
-sub register_label($$$)
+sub register_label($$)
 {
-  my ($target_elements_list, $target_element, $label) = @_;
+  my ($target_elements_list, $target_element) = @_;
 
   # register the element in the list.
   push @{$target_elements_list}, $target_element;
-  if ($label and $label->{'node_content'}) {
-    # register the label in the element
-    #$target_element->{'extra'} = {} if (!$current->{'extra'});
-    $target_element->{'extra'}->{'node_content'} = $label->{'node_content'};
-  }
 }
 
+sub get_label_element($)
+{
+  my $current = shift;
+  if (($current->{'cmdname'} eq 'node' or $current->{'cmdname'} eq 'anchor')
+      and $current->{'args'} and scalar(@{$current->{'args'}})) {
+    return $current->{'args'}->[0]
+  } elsif ($current->{'cmdname'} eq 'float'
+      and $current->{'args'} and scalar(@{$current->{'args'}}) >= 2) {
+    return $current->{'args'}->[1];
+  }
+  return undef;
+}
 
 # functions used for debugging.  May be used in other modules.
 # Not documented.
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 269ba0a723..f87dc541e1 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -718,27 +718,28 @@ sub normalized_sectioning_command_filename($$)
   return ($normalized_name, $filename);
 }
 
-sub node_information_filename($$)
+sub node_information_filename($$$)
 {
   my $self = shift;
-  my $node_info = shift;
+  my $normalized = shift;
+  my $node_contents = shift;
 
   my $no_unidecode;
   $no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
                         and !$self->get_conf('USE_UNIDECODE'));
 
   my $filename;
-  if (defined($node_info->{'normalized'})) {
+  if (defined($normalized)) {
     if ($self->get_conf('TRANSLITERATE_FILE_NAMES')) {
       $filename = 
Texinfo::Convert::NodeNameNormalization::normalize_transliterate_texinfo(
-       {'contents' => $node_info->{'node_content'}},
+       {'contents' => $node_contents},
             $no_unidecode);
     } else {
-      $filename = $node_info->{'normalized'};
+      $filename = $normalized;
     }
-  } elsif (defined($node_info->{'node_content'})) {
+  } elsif (defined($node_contents)) {
     $filename = Texinfo::Convert::NodeNameNormalization::normalize_node(
-             { 'contents' => $node_info->{'node_content'} });
+             { 'contents' => $node_contents });
   } else {
     $filename = '';
   }
@@ -979,11 +980,14 @@ sub _set_tree_units_files($$$$$$)
             my $node_filename;
             # double node are not normalized, they are handled here
             if (!defined($root_command->{'extra'}->{'normalized'})
-                or 
!defined($self->{'labels'}->{$root_command->{'extra'}->{'normalized'}})) {
+                or !defined($self->{'labels'}->{
+                               $root_command->{'extra'}->{'normalized'}})) {
               $node_filename = 'unknown_node';
             } else {
               $node_filename
-               = $self->node_information_filename($root_command->{'extra'});
+               = $self->node_information_filename(
+                               $root_command->{'extra'}->{'normalized'},
+                               $root_command->{'args'}->[0]->{'contents'});
             }
             $node_filename .= $extension;
             $self->set_file_path($node_filename,$destination_directory);
@@ -1476,23 +1480,16 @@ sub sort_element_counts($$;$$)
 
   require Texinfo::Convert::Texinfo;
   foreach my $element (@$elements) {
-    my $name = 'UNNAMED tree element';
+    my $name;
     if ($element->{'extra'} and $element->{'extra'}->{'unit_command'}) {
       my $command = $element->{'extra'}->{'unit_command'};
-      if ($command->{'cmdname'} eq 'node'
-          and $command->{'extra'}
-          and $command->{'extra'}->{'nodes_manuals'}
-          and scalar(@{$command->{'extra'}->{'nodes_manuals'}})
-          and $command->{'extra'}->{'nodes_manuals'}->[0]
-          and $command->{'extra'}->{'nodes_manuals'}->[0]->{'node_content'}) {
-        $name = Texinfo::Convert::Texinfo::convert_to_texinfo(
-    {'contents' => 
$command->{'extra'}->{'nodes_manuals'}->[0]->{'node_content'}});
-      } else {
+      if ($command->{'args'}->[0]->{'contents'}) {
         $name = "\@$command->{'cmdname'} "
-          
.Texinfo::Convert::Texinfo::convert_to_texinfo($command->{'args'}->[0]);
+          .Texinfo::Convert::Texinfo::convert_to_texinfo(
+                       {'contents' => $command->{'args'}->[0]->{'contents'}});
       }
     }
-    chomp($name);
+    $name = 'UNNAMED tree element' if (!defined($name));
     my $count;
     my $converted_element = $converter->convert_tree($element);
     if ($count_words) {
@@ -2105,11 +2102,11 @@ better formatted with new lines added independently of 
the presence
 of newline or comment in the initial Texinfo line, so most converters
 are better off not using this method.
 
-=item $filename = sub $converter->node_information_filename($node_info)
+=item $filename = sub $converter->node_information_filename($normalized, 
$node_contents)
 X<C<node_information_filename>>
 
-Returns the normalized file name corresponding to the I<$node_info>
-node element tree C<extra> field.
+Returns the normalized file name corresponding to the I<$normalized>
+node name and to the I<$node_contents> node name contents.
 
 =item ($normalized_name, $filename) = 
$converter->normalized_sectioning_command_filename($element)
 X<C<normalized_sectioning_command_filename>>
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 21dde72142..fc2f4c44ad 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1519,11 +1519,9 @@ sub _convert($$;$)
           }
         }
       } elsif ($element->{'cmdname'} eq 'float') {
-        if ($element->{'extra'} and 
defined($element->{'extra'}->{'node_content'})) {
-          my $normalized =
-            Texinfo::Convert::NodeNameNormalization::normalize_node (
-                   { 'contents' => $element->{'extra'}->{'node_content'} });
-          $result .= "<anchor id=\"$normalized\"/>\n";
+        if ($element->{'extra'}
+            and defined($element->{'extra'}->{'normalized'})) {
+          $result .= "<anchor id=\"$element->{'extra'}->{'normalized'}\"/>\n";
         }
       } elsif ($element->{'cmdname'} eq 'verbatim') {
         push @format_elements, 'screen';
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d38a425d33..b89a48af42 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1077,8 +1077,9 @@ sub command_text($$;$)
         $explanation = "command_text $special_element_variety";
       } elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'node'
                                           or $command->{'cmdname'} eq 
'anchor')) {
+        # FIXME is it possible not to have contents (nor args)?
         $tree = {'type' => '_code',
-                 'contents' => $command->{'extra'}->{'node_content'}};
+                 'contents' => $command->{'args'}->[0]->{'contents'}};
       } elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
         $tree = $self->float_type_number($command);
       } elsif ($command->{'extra'}
@@ -8393,21 +8394,19 @@ sub _prepare_css($)
 }
 
 # Get the name of a file containing a label, as well as the identifier within
-# that file to link to that label.  Argument is the 'extra' value on
-# an element hash, or something that looks like it.  Labels are typically
-# associated to @node, @anchor or @float.
-sub _normalized_label_id_file($$)
+# that file to link to that label.  $normalized is the normalized label name
+# and $node_contents is the label contents.  Labels are typically associated
+# to @node, @anchor or @float and to external nodes.
+sub _normalized_label_id_file($$$)
 {
   my $self = shift;
-  my $label_info = shift;
+  my $normalized = shift;
+  my $node_contents = shift;
 
   my $target;
-  my $normalized;
-  if ($label_info->{'normalized'}) {
-    $normalized = $label_info->{'normalized'};
-  } elsif ($label_info->{'node_content'}) {
+  if (!defined($normalized)) {
     $normalized = Texinfo::Convert::NodeNameNormalization::normalize_node(
-      { 'contents' => $label_info->{'node_content'} });
+      { 'contents' => $node_contents });
   }
 
   if (defined($normalized)) {
@@ -8415,13 +8414,14 @@ sub _normalized_label_id_file($$)
   } else {
     $target = '';
   }
-  # to find out the Top node, one could check $label_info->{'normalized'}
+  # to find out the Top node, one could check $normalized
   if (defined($self->{'file_id_setting'}->{'label_target_name'})) {
     $target = &{$self->{'file_id_setting'}->{'label_target_name'}}($self,
-                                                       $label_info, $target);
+                             $normalized, $node_contents, $target);
   }
 
-  my $filename = $self->node_information_filename($label_info);
+  my $filename = $self->node_information_filename($normalized,
+                                                  $node_contents);
 
   return ($filename, $target);
 }
@@ -8538,9 +8538,11 @@ sub _set_root_commands_targets_node_files($$)
                 and $self->get_conf('EXTENSION') ne '');
   if ($self->{'labels'}) {
     foreach my $label (sort(keys(%{$self->{'labels'}}))) {
-      my $label_element = $self->{'labels'}->{$label};
+      my $target_element = $self->{'labels'}->{$label};
+      my $label_element = Texinfo::Common::get_label_element($target_element);
       my ($node_filename, $target)
-        = $self->_normalized_label_id_file($label_element->{'extra'});
+        = 
$self->_normalized_label_id_file($target_element->{'extra'}->{'normalized'},
+                                           $label_element->{'contents'});
       $node_filename .= $extension;
       if (defined($self->{'file_id_setting'}->{'node_file_name'})) {
         # a non defined filename is ok if called with convert, but not
@@ -8548,7 +8550,7 @@ sub _set_root_commands_targets_node_files($$)
         # in case called by convert.
         my $user_node_filename
               = &{$self->{'file_id_setting'}->{'node_file_name'}}(
-                                       $self, $label_element, $node_filename);
+                                       $self, $target_element, $node_filename);
         if (defined($user_node_filename)) {
           $node_filename = $user_node_filename;
         } elsif ($self->get_conf('VERBOSE')) {
@@ -8563,10 +8565,10 @@ sub _set_root_commands_targets_node_files($$)
       if ($self->get_conf('DEBUG')) {
         print STDERR 'Label'
          # uncomment to get the perl object names
-         #."($label_element)"
-          ." \@$label_element->{'cmdname'} $target, $node_filename\n";
+         #."($target_element)"
+          ." \@$target_element->{'cmdname'} $target, $node_filename\n";
       }
-      $self->{'targets'}->{$label_element} = {'target' => $target,
+      $self->{'targets'}->{$target_element} = {'target' => $target,
                                            'node_filename' => $node_filename};
       $self->{'seen_ids'}->{$target} = 1;
     }
@@ -9360,7 +9362,8 @@ sub _external_node_href($$$;$)
 
   #print STDERR "external_node: ".join('|', keys(%$external_node))."\n";
   my ($target_filebase, $target)
-      = $self->_normalized_label_id_file($external_node);
+      = $self->_normalized_label_id_file($external_node->{'normalized'},
+                                         $external_node->{'node_content'});
 
   my $xml_target = _normalized_to_id($target);
 
@@ -11226,18 +11229,21 @@ sub output($$)
       and $self->{'labels'} and $output_file ne '') {
     my %redirection_filenames;
     foreach my $label (sort(keys (%{$self->{'labels'}}))) {
-      my $node = $self->{'labels'}->{$label};
-      my $target = $self->_get_target($node);
+      my $target_element = $self->{'labels'}->{$label};
+      my $label_element = Texinfo::Common::get_label_element($target_element);
+      my $label_contents = $label_element->{'contents'};
+      my $target = $self->_get_target($target_element);
       # filename may not be defined in case of an @anchor or similar in
       # @titlepage, and @titlepage is not used.
-      my $filename = $self->command_filename($node);
+      my $filename = $self->command_filename($target_element);
       my $node_filename;
       # NOTE 'node_filename' is not used for Top, TOP_NODE_FILE_TARGET
       # is.  The other manual must use the same convention to get it
       # right.  We do not do 'node_filename' as a redirection file
       # either.
-      if ($node->{'extra'} and $node->{'extra'}->{'normalized'}
-          and $node->{'extra'}->{'normalized'} eq 'Top'
+      if ($target_element->{'extra'}
+          and $target_element->{'extra'}->{'normalized'}
+          and $target_element->{'extra'}->{'normalized'} eq 'Top'
           and defined($self->get_conf('TOP_NODE_FILE_TARGET'))) {
         $node_filename = $self->get_conf('TOP_NODE_FILE_TARGET');
       } else {
@@ -11252,11 +11258,11 @@ sub output($$)
             or $redirection_filenames{$redirection_filename}) {
           $self->line_warn($self,
              sprintf(__("\@%s `%s' file %s for redirection exists"),
-               $node->{'cmdname'},
+               $target_element->{'cmdname'},
                Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                 => $node->{'extra'}->{'node_content'}}),
+                                                   => $label_contents}),
                $redirection_filename),
-            $node->{'source_info'});
+            $target_element->{'source_info'});
           my $file_source = $files_source_info{$redirection_filename};
           my $file_info_type = $file_source->{'file_info_type'};
           if ($file_info_type eq 'special_file'
@@ -11289,25 +11295,18 @@ sub output($$)
                      "conflict with \@%s `%s' file"),
                  $conflicting_node->{'cmdname'},
                  Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                   => $conflicting_node->{'extra'}->{'node_content'}}),
-                 ),
-              $conflicting_node->{'source_info'}, 1);
-          } elsif ($file_info_type eq 'node') {
-            my $conflicting_node = $file_source->{'file_info_element'};
-            $self->line_warn($self,
-               sprintf(__("conflict with \@%s `%s' file"),
-                 $conflicting_node->{'cmdname'},
-                 Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                   => $conflicting_node->{'extra'}->{'node_content'}}),
+                   => $conflicting_node->{'args'}->[0]->{'contents'}}),
                  ),
               $conflicting_node->{'source_info'}, 1);
           } elsif ($file_info_type eq 'redirection') {
             my $conflicting_node = $file_source->{'file_info_element'};
+            my $conflicting_label_contents
+                 = $file_source->{'file_info_label_contents'};
             $self->line_warn($self,
                sprintf(__("conflict with \@%s `%s' redirection file"),
                  $conflicting_node->{'cmdname'},
                  Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                   => $conflicting_node->{'extra'}->{'node_content'}}),
+                                            => $conflicting_label_contents}),
                  ),
               $conflicting_node->{'source_info'}, 1);
           } elsif ($file_info_type eq 'section') {
@@ -11330,12 +11329,14 @@ sub output($$)
           }
           next;
         }
-        $redirection_filenames{$redirection_filename} = $node;
+        $redirection_filenames{$redirection_filename} = $target_element;
         $files_source_info{$redirection_filename}
-          = {'file_info_type' => 'redirection', 'file_info_element' => $node};
+          = {'file_info_type' => 'redirection',
+             'file_info_element' => $target_element,
+             'file_info_label_contents' => $label_contents};
         my $redirection_page
           = 
&{$self->formatting_function('format_node_redirection_page')}($self,
-                                                                         
$node);
+                                                               
$target_element);
         my $out_filename;
         if (defined($destination_directory) and $destination_directory ne '') {
           $out_filename = File::Spec->catfile($destination_directory,
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index eaa1aab900..3821cb7f5e 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -822,10 +822,11 @@ sub output_ixin($$)
         } else {
           $float_text .= $self->ixin_none_element('floatlabel');
         }
-        if ($float->{'extra'}->{'node_content'}) {
+        if ($float->{'args'} and scalar(@{$float->{'args'}}) >= 2
+            and $float->{'args'}->[1]->{'contents'}) {
           $float_text .= $self->ixin_open_element('floatname');
           $float_text .= $self->convert_tree({'contents'
-                                 => $float->{'extra'}->{'node_content'}});
+                                 => $float->{'args'}->[1]->{'contents'}});
           $float_text .= $self->ixin_close_element('floatname');
         } else {
           $float_text .= $self->ixin_none_element('floatname');
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index 0a0ff1c5d2..060494e358 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -253,7 +253,8 @@ sub output($)
   my %seen_anchors;
   foreach my $label (@{$self->{'count_context'}->[-1]->{'locations'}}) {
     next unless ($label->{'root'} and $label->{'root'}->{'extra'}
-                   and defined($label->{'root'}->{'extra'}->{'node_content'}));
+                 and defined($label->{'root'}->{'extra'}->{'normalized'}));
+    my $label_element = Texinfo::Common::get_label_element($label->{'root'});
     my $prefix;
     
     if ($label->{'root'}->{'cmdname'} eq 'node') {
@@ -264,10 +265,11 @@ sub output($)
     my ($label_text, $byte_count) = $self->node_line($label->{'root'});
 
     if ($seen_anchors{$label_text}) {
-      $self->converter_line_error($self, sprintf(__("\@%s output more than 
once: %s"),
+      $self->converter_line_error($self,
+                                  sprintf(__("\@%s output more than once: %s"),
           $label->{'root'}->{'cmdname'},
           Texinfo::Convert::Texinfo::convert_to_texinfo({'contents' =>
-              $label->{'root'}->{'extra'}->{'node_content'}})),
+                                                  
$label_element->{'contents'}})),
         $label->{'root'}->{'source_info'});
       next;
     } else {
@@ -430,9 +432,15 @@ sub format_node($$)
 {
   my $self = shift;
   my $node = shift;
-  
+
   my $result = '';
-  return '' if (!defined($node->{'extra'}->{'node_content'}));
+  return '' if (not $node->{'extra'}
+                or not defined($node->{'extra'}->{'normalized'}));
+
+  my ($node_text, $byte_count) = $self->node_line($node);
+  # check not needed most probably because of the test of 'normalized'.
+  #return '' if ($node_text eq '');
+
   if (!$self->{'empty_lines_count'}) {
     $result .= "\n";
     $self->add_text_to_count("\n");
@@ -457,7 +465,6 @@ sub format_node($$)
   my $node_begin = "\x{1F}\nFile: $output_filename,  Node: ";
   $result .= $node_begin;
   $self->add_text_to_count($node_begin);
-  my ($node_text, $byte_count) = $self->node_line($node);
   my $pre_quote = '';
   my $post_quote = '';
   if ($node_text =~ /,/) {
@@ -486,7 +493,7 @@ sub format_node($$)
                              @{$node_direction->{'extra'}->{'manual_content'}},
                                           {'text' => ')'}]});
       }
-      if ($node_direction->{'extra'}->{'node_content'}) {
+      if ($node_direction->{'extra'}->{'normalized'}) {
         my $pre_quote = '';
         my $post_quote = '';
         my ($node_text, $byte_count) = $self->node_line($node_direction);
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 125582cf99..d90eec2d85 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3127,7 +3127,7 @@ sub _convert($$)
       return $result;
     } elsif ($cmdname eq 'anchor') {
       my $anchor_label
-         = _tree_anchor_label($element->{'extra'}->{'node_content'});
+         = _tree_anchor_label($element->{'args'}->[0]->{'contents'});
       $result .= "\\label{$anchor_label}%\n";
       return $result;
     } elsif ($ref_commands{$cmdname}) {
@@ -3181,7 +3181,8 @@ sub _convert($$)
           my $reference
            = $self->{'labels'}
                    ->{$element->{'extra'}->{'node_argument'}->{'normalized'}};
-          my $reference_node_content = $reference->{'extra'}->{'node_content'};
+          my $label_element = Texinfo::Common::get_label_element($reference);
+          my $reference_node_content = $label_element->{'contents'};
           
           my $section_command;
           if ($reference->{'extra'}->{'associated_section'}) {
@@ -3693,7 +3694,7 @@ sub _convert($$)
         # add the label only if not associated with a section
         if (not $element->{'extra'}->{'associated_section'}) {
           my $node_label
-            = _tree_anchor_label($element->{'extra'}->{'node_content'});
+            = _tree_anchor_label($element->{'args'}->[0]->{'contents'});
           $result .= "\\label{$node_label}%\n";
         }
       } else {
@@ -3733,7 +3734,7 @@ sub _convert($$)
         if ($element->{'extra'} and $element->{'extra'}->{'associated_node'}) {
           my $associated_node = $element->{'extra'}->{'associated_node'};
           my $node_label
-            = 
_tree_anchor_label($associated_node->{'extra'}->{'node_content'});
+            = 
_tree_anchor_label($associated_node->{'args'}->[0]->{'contents'});
           $result .= "\\label{$node_label}%\n";
         }
       }
@@ -4290,9 +4291,10 @@ sub _convert($$)
     if ($cmdname eq 'float') {
       # do that at the end of the float to be sure that it is after
       # the caption
-      if ($element->{'extra'} and $element->{'extra'}->{'node_content'}) {
+      if ($element->{'args'} and scalar(@{$element->{'args'}}) >= 2
+          and $element->{'args'}->[1]->{'contents'}) {
         my $float_label
-          = _tree_anchor_label($element->{'extra'}->{'node_content'});
+          = _tree_anchor_label($element->{'args'}->[1]->{'contents'});
         $result .= "\\label{$float_label}%\n";
       }
       if (not $self->{'formatting_context'}->[-1]->{'in_skipped_node_top'}) {
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm 
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index 69a129ac03..8df24cfcd4 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -363,16 +363,16 @@ sub set_nodes_list_labels($$$)
           }
         }
       }
-      if (defined $target->{'extra'}
-            and defined $target->{'extra'}->{'node_content'}) {
+      my $label_element = Texinfo::Common::get_label_element($target);
+      if ($label_element and $label_element->{'contents'}) {
         my $normalized = 
Texinfo::Convert::NodeNameNormalization::normalize_node(
-                             {'contents' => 
$target->{'extra'}->{'node_content'}});
-
+                             $label_element);
         if ($normalized !~ /[^-]/) {
           $registrar->line_error($configuration_information,
                sprintf(__("empty node name after expansion `%s'"),
-                     Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                                   => $target->{'extra'}->{'node_content'}})),
+                     # convert the contents only, to avoid spaces
+                     Texinfo::Convert::Texinfo::convert_to_texinfo(
+                                         {'contents' => 
$label_element->{'contents'}})),
                             $target->{'source_info'});
           delete $target->{'extra'}->{'node_content'};
         } else {
@@ -381,7 +381,7 @@ sub set_nodes_list_labels($$$)
               sprintf(__("\@%s `%s' previously defined"),
                          $target->{'cmdname'},
                    Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                                    => $target->{'extra'}->{'node_content'}})),
+                                    => $label_element->{'contents'}})),
                                $target->{'source_info'});
             $registrar->line_error($configuration_information,
               sprintf(__("here is the previous definition as \@%s"),
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 7d2bde58f2..bd49b0f157 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -33,6 +33,8 @@ use strict;
 # To check if there is no erroneous autovivification
 #no autovivification qw(fetch delete exists store strict);
 
+use Carp qw(cluck);
+
 use Texinfo::Commands;
 use Texinfo::Common;
 use Texinfo::Convert::Texinfo;
@@ -948,32 +950,41 @@ sub process_footnotes($;$)
 {
   my ($self, $element) = @_;
 
-  $element = undef if ($element and
-                       (not defined($element->{'extra'})
-                        or not 
defined($element->{'extra'}->{'unit_command'})));
-
   my $result = '';
   if (scalar(@{$self->{'pending_footnotes'}})) {
+
+    $element = undef if ($element and
+                         (not defined($element->{'extra'})
+                          or not 
defined($element->{'extra'}->{'unit_command'})));
+    my $node_element;
+    my $node_contents;
+    if ($element) {
+      $node_element = $element->{'extra'}->{'unit_command'};
+      if ($node_element->{'extra'}
+          and defined($node_element->{'extra'}->{'normalized'})) {
+        $node_contents = $node_element->{'args'}->[0]->{'contents'};
+      }
+    }
+
     $result .= _add_newline_if_needed($self);
     if ($self->get_conf('footnotestyle') eq 'end'
         # no node content happens only in very special cases, such as
         # a @footnote in @copying and @insertcopying (and USE_NODES=0?)
-        or !$element or !$element->{'extra'}->{'unit_command'}->{'extra'}
-        or 
!$element->{'extra'}->{'unit_command'}->{'extra'}->{'node_content'}) {
+        or !$node_contents) {
       my $footnotes_header = "   ---------- Footnotes ----------\n\n";
       $result .= $footnotes_header;
       add_text_to_count($self, $footnotes_header);
       _add_lines_count($self, 2);
       $self->{'empty_lines_count'} = 1;
     } else {
-
-      my $node_contents
-       = 
[@{$element->{'extra'}->{'unit_command'}->{'extra'}->{'node_content'}},
-          {'text' => '-Footnotes'}];
+      my $footnotes_node_contents
+            = [@$node_contents, {'text' => '-Footnotes'}];
       my $footnotes_node = {
         'cmdname' => 'node',
-        'structure' => {'node_up' => $element->{'extra'}->{'unit_command'}},
-        'extra' => {'node_content' => $node_contents }
+        'structure' => {'node_up' => $node_element},
+        'args' => [{'contents' => $footnotes_node_contents}],
+        'extra' => {'normalized'
+                  => $node_element->{'extra'}->{'normalized'}.'-Footnotes'}
       };
       $result .= $self->format_node($footnotes_node);
       $self->{'current_node'} = $footnotes_node;
@@ -986,13 +997,15 @@ sub process_footnotes($;$)
       # element, while the pxref will point to the name with the
       # footnote node taken into account.  Not really problematic as
       # nested footnotes are not right.
-      if ($element and $element->{'extra'}->{'unit_command'}->{'extra'}
-          and 
$element->{'extra'}->{'unit_command'}->{'extra'}->{'node_content'}) {
-        my $node_contents
-         = 
[@{$element->{'extra'}->{'unit_command'}->{'extra'}->{'node_content'}},
-            {'text' => "-Footnote-$footnote->{'number'}"}];
+      if ($node_contents) {
+        my $footnote_anchor_postfix = "-Footnote-$footnote->{'number'}";
+        my $footnote_anchor_contents
+         = [@$node_contents,
+            {'text' => $footnote_anchor_postfix}];
         $self->add_location({'cmdname' => 'anchor',
-                             'extra' => {'node_content' => $node_contents }
+                    'args' => [{'contents' => $footnote_anchor_contents}],
+                    'extra' => {'normalized'
+       => $node_element->{'extra'}->{'normalized'}.$footnote_anchor_postfix},
                             });
       }
       # this pushes on 'context', 'formatters', 'format_context',
@@ -1297,8 +1310,16 @@ sub node_line($$)
   my ($self, $node) = @_;
   $self->{'node_lines_text'} = {} if (!$self->{'node_lines_text'});
   if (!$self->{'node_lines_text'}->{$node}) {
+    my $node_contents;
+    if ($node->{'cmdname'}) {
+      my $label_element = Texinfo::Common::get_label_element($node);
+      $node_contents = $label_element->{'contents'};
+    } else {
+      # node direction to an external node
+      $node_contents = $node->{'extra'}->{'node_content'};
+    }
     my $node_text = {'type' => '_code',
-              'contents' => $node->{'extra'}->{'node_content'}};
+              'contents' => $node_contents};
     push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
     $self->{'node_lines_text'}->{$node}
       = {'text' => _normalize_top_node($self->convert_line($node_text,
@@ -2164,7 +2185,7 @@ sub _convert($$)
            'args' => [
              {'type' => 'brace_command_arg',
               'contents' => [
-                 @{$self->{'current_node'}->{'extra'}->{'node_content'}},
+                 @{$self->{'current_node'}->{'args'}->[0]->{'contents'}},
                  {'text' => "-Footnote-$self->{'footnote_index'}"}
               ]
              }
@@ -2195,11 +2216,14 @@ sub _convert($$)
         # NOTE as a consequence, the line numbers appearing in case of errors
         # correspond to the node lines numbers, and not the @ref.
         my $node_content;
-        if ($element->{'extra'}
-            and $element->{'extra'}->{'label'}) {
-          $node_content
-              = $element->{'extra'}->{'label'}->{'extra'}->{'node_content'};
-        } else {
+        if ($element->{'extra'} and $element->{'extra'}->{'label'}) {
+          my $label_element
+            = 
Texinfo::Common::get_label_element($element->{'extra'}->{'label'});
+          if (defined($label_element) and $label_element->{'contents'}) {
+            $node_content = $label_element->{'contents'};
+          }
+        }
+        if (!defined($node_content)) {
           $node_content = $args[0];
         }
 
@@ -2632,7 +2656,8 @@ sub _convert($$)
         $self->{'document_context'}->[-1]->{'in_multitable'}++;
       } elsif ($command eq 'float') {
         $result .= _add_newline_if_needed($self);
-        if ($element->{'extra'} and $element->{'extra'}->{'node_content'}) {
+        if ($element->{'args'} and scalar(@{$element->{'args'}}) >= 2
+            and $element->{'args'}->[1]->{'contents'}) {
           $result .= $self->_anchor($element);
         }
       } elsif ($command eq 'cartouche') {
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 32ab54c9ff..661a0ee5f1 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -38,6 +38,7 @@ use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
 %EXPORT_TAGS = ( 'all' => [ qw(
   convert_to_texinfo
   node_extra_to_texi
+  target_element_to_texi_label
 ) ] );
 
 @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
@@ -59,6 +60,7 @@ for my $a (@ignored_types) {
   $ignored_types{$a} = 1;
 }
 
+# TODO document?
 # used to put a node name in error messages.
 sub node_extra_to_texi($)
 {
@@ -74,6 +76,17 @@ sub node_extra_to_texi($)
   return $result;
 }
 
+# TODO document?
+sub target_element_to_texi_label($)
+{
+  my $element = shift;
+  if ($element->{'extra'} and $element->{'extra'}->{'manual_content'}) {
+    return node_extra_to_texi($element->{'extra'});
+  }
+  my $label_element = Texinfo::Common::get_label_element($element);
+  return convert_to_texinfo({'contents' => $label_element->{'contents'}});
+}
+
 # for debugging.
 sub root_heading_command_to_texinfo($)
 {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 65e7fd67ac..4c2dba2e97 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -802,10 +802,11 @@ sub _convert($$;$)
                           [['name', $nodename], 
_leading_spaces_arg($element)]);
           push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
           $result .= $self->txi_markup_open_element('nodename',
-                               [_trailing_spaces_arg($element->{'args'}->[0])])
-             .$self->_convert({'contents'
-                                  => $element->{'extra'}->{'node_content'}})
-             .$self->txi_markup_close_element('nodename');
+                               
[_trailing_spaces_arg($element->{'args'}->[0])]);
+          $result .= $self->_convert({'contents'
+                                  => $element->{'args'}->[0]->{'contents'}})
+            if ($nodename ne '');
+          $result .= $self->txi_markup_close_element('nodename');
           # first arg is the node name, directions start at 1.
           my $direction_index = 1;
           my $pending_empty_directions = '';
@@ -831,10 +832,10 @@ sub _convert($$;$)
                               
@{$node_direction->{'extra'}->{'manual_content'}},
                                             {'text' => ')'}]});
                 }
-                if ($node_direction->{'extra'}->{'node_content'}) {
+                if (defined($node_direction->{'extra'}->{'normalized'})) {
                   $node_name .= Texinfo::Common::normalize_top_node_name(
                     $self->_convert({'contents'
-                             => 
$node_direction->{'extra'}->{'node_content'}}));
+                             => 
$node_direction->{'args'}->[0]->{'contents'}}));
                 }
               } else {
                 $node_name
@@ -1254,11 +1255,8 @@ sub _convert($$;$)
         push @$attribute, ['first',
                            $element->{'extra'}->{'enumerate_specification'}];
       } elsif ($element->{'cmdname'} eq 'float' and $element->{'extra'}) {
-        if (defined($element->{'extra'}->{'node_content'})) {
-          my $normalized =
-            Texinfo::Convert::NodeNameNormalization::normalize_node (
-                   { 'contents' => $element->{'extra'}->{'node_content'} });
-          push @$attribute, ['name', $normalized];
+        if (defined($element->{'extra'}->{'normalized'})) {
+          push @$attribute, ['name', $element->{'extra'}->{'normalized'}];
         }
         push @$attribute, ['type',
                            $element->{'extra'}->{'float_type'}];
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index b29669deae..2f1b739376 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3483,8 +3483,7 @@ sub _end_line_misc_line($$$)
     }
     _check_internal_node($self, $current->{'extra'}->{'nodes_manuals'}->[0],
                          $source_info);
-    Texinfo::Common::register_label($self->{'targets'}, $current,
-                                    
$current->{'extra'}->{'nodes_manuals'}->[0]);
+    Texinfo::Common::register_label($self->{'targets'}, $current);
     if ($self->{'current_part'}) {
       my $part = $self->{'current_part'};
       if (not $part->{'extra'}
@@ -3857,7 +3856,7 @@ sub _end_line_starting_block($$$)
     # good to do in Parser/XS
     #my $float_type = _parse_float_type($current);
     #push @{$self->{'floats'}->{$float_type}}, $current;
-    Texinfo::Common::register_label($self->{'targets'}, $current, 
$float_label);
+    Texinfo::Common::register_label($self->{'targets'}, $current);
     if (defined($self->{'current_section'})) {
       $current->{'extra'} = {} if (!defined($current->{'extra'}));
       $current->{'extra'}->{'float_section'} = $self->{'current_section'};
@@ -6273,8 +6272,7 @@ sub _process_remaining_on_line($$$$)
           if (_check_node_label($self, $parsed_anchor,
                             $current->{'parent'}->{'cmdname'}, $source_info)) {
             Texinfo::Common::register_label($self->{'targets'},
-                                            $current->{'parent'},
-                                            $parsed_anchor);
+                                            $current->{'parent'});
              # the @anchor element_region information is not used in converters
              if ($self->{'nesting_context'}
                  and $self->{'nesting_context'}->{'regions_stack'}
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 0f50cdd0e6..10b09fa872 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -40,7 +40,7 @@ use Texinfo::Commands;
 use Texinfo::Common;
 
 # for error messages
-use Texinfo::Convert::Texinfo qw(node_extra_to_texi);
+use Texinfo::Convert::Texinfo qw(node_extra_to_texi 
target_element_to_texi_label);
 # for debugging.  Also for index entries sorting.
 use Texinfo::Convert::Text;
 # for internal references and misc uses
@@ -330,15 +330,18 @@ sub warn_non_empty_parts($$$)
   }
 }
 
+# $REFERENCE_NODE should always be a target element associated to
+# a label.
 sub _check_node_same_texinfo_code($$)
 {
   my $reference_node = shift;
   my $node_extra = shift;
 
   my $reference_node_texi;
-  if ($reference_node->{'extra'}->{'node_content'}) {
+  if (defined($reference_node->{'extra'}->{'normalized'})) {
+    my $label_element = Texinfo::Common::get_label_element($reference_node);
     $reference_node_texi = Texinfo::Convert::Texinfo::convert_to_texinfo(
-        {'contents' => $reference_node->{'extra'}->{'node_content'}});
+        {'contents' => $label_element->{'contents'}});
     $reference_node_texi =~ s/\s+/ /g;
   } else {
     $reference_node_texi = '';
@@ -393,7 +396,7 @@ sub _check_menu_entry($$$$$)
          $command,
          
node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node_label'}),
          $menu_node->{'cmdname'},
-         node_extra_to_texi($menu_node->{'extra'})),
+         target_element_to_texi_label($menu_node)),
        $menu_content->{'source_info'});
     }
   }
@@ -457,7 +460,7 @@ sub check_nodes_are_referenced
     if (not exists($referenced_nodes{$node})) {
       $registrar->line_warn($customization_information,
                             sprintf(__("node `%s' unreferenced"),
-                                    node_extra_to_texi($node->{'extra'})),
+                                    target_element_to_texi_label($node)),
                             $node->{'source_info'});
     }
   }
@@ -655,8 +658,8 @@ sub complete_node_tree_with_menus($$$$)
                   $registrar->line_warn($customization_information,
            sprintf(__("node %s for `%s' is `%s' in sectioning but not in 
menu"),
                    $direction,
-                   node_extra_to_texi($node->{'extra'}),
-                   node_extra_to_texi($direction_associated_node->{'extra'})),
+                   target_element_to_texi_label($node),
+                   target_element_to_texi_label($direction_associated_node)),
                                         $node->{'source_info'});
                 }
               }
@@ -675,10 +678,10 @@ sub complete_node_tree_with_menus($$$$)
                   and $node->{'extra'}->{'associated_section'}) {
               $registrar->line_warn($customization_information,
           sprintf(__("node `%s' is %s for `%s' in menu but not in sectioning"),
-                node_extra_to_texi(
-                         
$node->{'structure'}->{'menu_'.$direction}->{'extra'}),
+                target_element_to_texi_label(
+                         $node->{'structure'}->{'menu_'.$direction}),
                                    $direction,
-                node_extra_to_texi($node->{'extra'}),
+                target_element_to_texi_label($node),
                   ),
                 $node->{'source_info'});
             }
@@ -727,12 +730,12 @@ sub complete_node_tree_with_menus($$$$)
           $registrar->line_warn($customization_information,
             sprintf(__("node %s pointer for `%s' is `%s' but %s is `%s' in 
menu"),
                   $direction,
-                  node_extra_to_texi($node->{'extra'}),
-                  node_extra_to_texi(
-                      $node->{'structure'}->{'node_'.$direction}->{'extra'}),
+                  target_element_to_texi_label($node),
+                  target_element_to_texi_label(
+                               $node->{'structure'}->{'node_'.$direction}),
                   $direction,
-                  node_extra_to_texi(
-                      $node->{'structure'}->{'menu_'.$direction}->{'extra'})),
+                  target_element_to_texi_label(
+                      $node->{'structure'}->{'menu_'.$direction})),
                  $node->{'source_info'});
         }
       }
@@ -752,8 +755,8 @@ sub complete_node_tree_with_menus($$$$)
         $registrar->line_warn($customization_information,
          sprintf(
            __("node `%s' lacks menu item for `%s' despite being its Up 
target"),
-           node_extra_to_texi($node->{'structure'}->{'node_up'}->{'extra'}),
-           node_extra_to_texi($node->{'extra'})),
+           target_element_to_texi_label($node->{'structure'}->{'node_up'}),
+           target_element_to_texi_label($node)),
          $node->{'structure'}->{'node_up'}->{'source_info'});
       }
       # FIXME check that the menu_up_hash is not empty (except for Top)?
@@ -862,9 +865,9 @@ sub nodes_tree($$$$$)
              __("%s pointer `%s' (for node `%s') different from %s name `%s'"),
                   $direction_texts{$direction},
                   node_extra_to_texi($node_direction),
-                  node_extra_to_texi($node->{'extra'}),
+                  target_element_to_texi_label($node),
                                      $node_target->{'cmdname'},
-                  node_extra_to_texi($node_target->{'extra'})),
+                  target_element_to_texi_label($node_target)),
                 $node->{'source_info'});
             }
           } else {
@@ -1507,7 +1510,7 @@ sub associate_internal_references($$$$$)
                  $ref->{'cmdname'},
                  node_extra_to_texi($node_arg),
                  $node_target->{'cmdname'},
-                 node_extra_to_texi($node_target->{'extra'})),
+                 target_element_to_texi_label($node_target)),
              $ref->{'source_info'});
         }
       }
@@ -1524,7 +1527,7 @@ sub number_floats($)
     my $float_index = 0;
     foreach my $float (@{$floats->{$style}}) {
       next if (!$float->{'extra'}
-               or !defined($float->{'extra'}->{'node_content'}));
+               or !defined($float->{'extra'}->{'normalized'}));
       $float_index++;
       my $number;
       if ($float->{'extra'}->{'float_section'}) {
@@ -1601,7 +1604,9 @@ sub new_node_menu_entry
   my ($node, $use_sections) = @_;
 
   my $node_contents;
-  $node_contents = $node->{'extra'}->{'node_content'} if ($node->{'extra'});
+  if ($node->{'extra'} and defined($node->{'extra'}->{'normalized'})) {
+    $node_contents = $node->{'args'}->[0]->{'contents'};
+  }
 
   # can happen with node without argument or with empty argument
   return undef if (not defined($node_contents));
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 722a4b1031..499ae99ee3 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -244,11 +244,10 @@ sub _new_node($$$$)
                                          or $comment_at_end);
 
   my $appended_number = 0 +$empty_node;
-  my ($node, $parsed_node);
+  my ($node, $normalized);
 
   while (!defined($node)
-         or ($labels
-            and $labels->{$parsed_node->{'normalized'}})) {
+         or ($labels and $labels->{$normalized})) {
     $node = {'cmdname' => 'node',
              'args' => [
                {'type' => 'line_arg',}
@@ -268,18 +267,14 @@ sub _new_node($$$$)
     foreach my $content (@{$node_line_arg->{'contents'}}) {
       $content->{'parent'} = $node_line_arg;
     }
-    my $modified_node_content;
-    ($parsed_node, $modified_node_content)
-       = Texinfo::Common::parse_node_manual($node_line_arg);
-    if ($parsed_node and $parsed_node->{'node_content'}) {
-      $parsed_node->{'normalized'} =
-       Texinfo::Convert::NodeNameNormalization::normalize_node(
-        { 'contents' => $parsed_node->{'node_content'} });
-    }
-    $node_line_arg->{'contents'} = $modified_node_content;
-    if (!defined($parsed_node) or !$parsed_node->{'node_content'}
-        or $parsed_node->{'normalized'} !~ /[^-]/) {
+
+    $normalized = Texinfo::Convert::NodeNameNormalization::normalize_node(
+                       { 'contents' => $node_line_arg->{'contents'} });
+
+    if ($normalized !~ /[^-]/) {
       if ($appended_number) {
+        # FIXME does not seems to be possible, as there is a trailing number.
+        # Maybe in case of error?
         return undef;
       } else {
         $node = undef;
@@ -288,12 +283,14 @@ sub _new_node($$$$)
     $appended_number++;
   }
 
-  push @{$node->{'extra'}->{'nodes_manuals'}}, $parsed_node;
-  if ($parsed_node->{'normalized'} ne '') {
-    $labels->{$parsed_node->{'normalized'}} = $node;
-    $node->{'extra'}->{'normalized'} = $parsed_node->{'normalized'};
+  $node->{'extra'}->{'normalized'} = $normalized;
+  push @{$node->{'extra'}->{'nodes_manuals'}}, $node;
+  # FIXME $node->{'extra'}->{'normalized'} eq '' does not seems to be possible,
+  # as in that case there should be a return undef in the loop.
+  if ($node->{'extra'}->{'normalized'} ne '') {
+    $labels->{$node->{'extra'}->{'normalized'}} = $node;
   }
-  Texinfo::Common::register_label($targets_list, $node, $parsed_node);
+  Texinfo::Common::register_label($targets_list, $node);
   push @{$nodes_list}, $node;
   return $node;
 }
@@ -567,7 +564,8 @@ sub _print_down_menus($$)
           = Texinfo::Common::copy_contents(
                       
$node->{'extra'}->{'associated_section'}->{'args'}->[0]->{'contents'});
       } else {
-        $node_title_contents = 
Texinfo::Common::copy_contents($node->{'extra'}->{'node_content'});
+        $node_title_contents
+           = 
Texinfo::Common::copy_contents($node->{'args'}->[0]->{'contents'});
       }
       my $menu_comment = {'type' => 'menu_comment', 'contents' => []};
       $menu_comment->{'contents'}->[0] = {'type' => 'preformatted',
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 205e4d87c7..4d2f8879bd 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1139,7 +1139,7 @@ end_line_starting_block (ELEMENT *current)
           float_label = parse_node_manual (args_child_by_index (current, 1));
           check_internal_node (float_label);
 
-          register_label (current, float_label->node_content);
+          register_label (current);
           if (float_label->manual_content)
             destroy_element (float_label->manual_content);
           free (float_label);
@@ -1868,7 +1868,7 @@ end_line_misc_line (ELEMENT *current)
                    contents_child_by_index(nodes_manuals[0]->node_content, i));
                 }
             }
-          register_label (current, label);
+          register_label (current);
         }
       if (current_part
           && !lookup_extra (current_part, "part_associated_section"))
diff --git a/tp/Texinfo/XS/parsetexi/labels.c b/tp/Texinfo/XS/parsetexi/labels.c
index 57f1885205..1ee347c783 100644
--- a/tp/Texinfo/XS/parsetexi/labels.c
+++ b/tp/Texinfo/XS/parsetexi/labels.c
@@ -27,7 +27,7 @@ size_t labels_space = 0;
    a reference and must be unique in the document.  Corresponds to @node,
    @anchor, and @float (float label corresponds to the second argument). */
 void
-register_label (ELEMENT *target_element, ELEMENT *label)
+register_label (ELEMENT *target_element)
 {
   /* register the element in the list. */
   if (labels_number == labels_space)
@@ -40,10 +40,6 @@ register_label (ELEMENT *target_element, ELEMENT *label)
         fatal ("realloc failed");
     }
   target_elements_list[labels_number++] = target_element;
-
-  /* register the label in the element */
-  if (label)
-    add_extra_contents (target_element, "node_content", label);
 }
 
 void
diff --git a/tp/Texinfo/XS/parsetexi/labels.h b/tp/Texinfo/XS/parsetexi/labels.h
index 5bff2e7956..3d83b25eae 100644
--- a/tp/Texinfo/XS/parsetexi/labels.h
+++ b/tp/Texinfo/XS/parsetexi/labels.h
@@ -20,7 +20,7 @@
 
 extern ELEMENT **target_elements_list;
 extern size_t labels_number;
-void register_label (ELEMENT *current, ELEMENT *label);
+void register_label (ELEMENT *current);
 void reset_labels (void);
 
 
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 41494a4dcb..230e37e7c3 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -271,7 +271,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
           parsed_anchor = parse_node_manual (current);
           if (check_node_label (parsed_anchor, CM_anchor))
             {
-              register_label (current->parent, parsed_anchor->node_content);
+              register_label (current->parent);
               if (nesting_context.regions_stack.top > 0)
                 {
                   add_extra_string_dup (current, "element_region",
diff --git a/tp/init/documentation_examples.pm 
b/tp/init/documentation_examples.pm
index dcd52d4cc3..1ca8053004 100644
--- a/tp/init/documentation_examples.pm
+++ b/tp/init/documentation_examples.pm
@@ -135,10 +135,10 @@ 
texinfo_register_file_id_setting_function('node_file_name',
                                           \&my_node_file_name);
 
 
-sub my_label_target_name($$$) {
-  my ($converter, $label_info, $default_target) = @_;
-  if (defined($label_info->{'normalized'})) {
-    my $element = $converter->label_command($label_info->{'normalized'});
+sub my_label_target_name($$$$) {
+  my ($converter, $normalized, $node_contents, $default_target) = @_;
+  if (defined($normalized)) {
+    my $element = $converter->label_command($normalized);
     return 'prepended_to_labels-'.$element->{'extra'}->{'normalized'};
   }
   return $default_target;
diff --git a/tp/t/results/conditionals/cond.pl 
b/tp/t/results/conditionals/cond.pl
index b4c81f60a6..1f413871fb 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -284,9 +284,6 @@ $result_trees{'cond'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -744,9 +741,6 @@ $result_trees{'cond'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -781,9 +775,7 @@ $result_trees{'cond'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'cond'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'cond'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond'} = '\\input texinfo
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index cc3277d01a..4dd0baca03 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -290,9 +290,6 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -750,9 +747,6 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -787,9 +781,7 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_ifhtml_ifinfo'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'cond_ifhtml_ifinfo'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_ifhtml_ifinfo'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond_ifhtml_ifinfo'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_ifhtml_ifinfo'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'cond_ifhtml_ifinfo'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_ifhtml_ifinfo'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond_ifhtml_ifinfo'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_ifhtml_ifinfo'} = '\\input texinfo
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index e33f15cdb4..78f2fba0f0 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -290,9 +290,6 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -756,9 +753,6 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -793,9 +787,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_ifhtml_ifinfo_iftex'} = '\\input texinfo
diff --git a/tp/t/results/conditionals/cond_info.pl 
b/tp/t/results/conditionals/cond_info.pl
index 4b881b7ed9..5f130420e3 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -284,9 +284,6 @@ $result_trees{'cond_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -744,9 +741,6 @@ $result_trees{'cond_info'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -781,9 +775,7 @@ $result_trees{'cond_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_info'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'cond_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_info'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_info'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'cond_info'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_info'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond_info'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_info'} = '\\input texinfo
diff --git a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
index da27e3de48..473d9105d2 100644
--- a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -290,9 +290,6 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -756,9 +753,6 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -793,9 +787,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_info_ifhtml_ifinfo_iftex'} = '\\input texinfo
diff --git 
a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index 9e07f10c09..3cf7019a65 100644
--- a/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -284,9 +284,6 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -744,9 +741,6 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -781,9 +775,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = '\\input texinfo
diff --git a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index f89b5a968a..c38a3e5bed 100644
--- a/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -284,9 +284,6 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -744,9 +741,6 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -781,9 +775,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_no-ifhtml_no-ifinfo_no-iftex'} = '\\input texinfo
diff --git a/tp/t/results/conditionals/cond_xml.pl 
b/tp/t/results/conditionals/cond_xml.pl
index 019ae88df7..f5fb0d3a6c 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -284,9 +284,6 @@ $result_trees{'cond_xml'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -744,9 +741,6 @@ $result_trees{'cond_xml'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -781,9 +775,7 @@ $result_trees{'cond_xml'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cond_xml'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'cond_xml'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_xml'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond_xml'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cond_xml'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'cond_xml'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cond_xml'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cond_xml'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cond_xml'} = '\\input texinfo
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index ffb6c7a1de..b5b01e2038 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -29,9 +29,6 @@ $result_trees{'at_commands_in_raw'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -172,9 +169,6 @@ $result_trees{'at_commands_in_raw'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -279,9 +273,6 @@ $result_trees{'at_commands_in_raw'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'anchor-in-html'
                   },
                   'source_info' => {
@@ -1102,11 +1093,8 @@ $result_trees{'at_commands_in_raw'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'at_commands_in_raw'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'at_commands_in_raw'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'at_commands_in_raw'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index 70c4124f55..8240940521 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -73,9 +73,6 @@ $result_trees{'combined_fonts'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -153,9 +150,6 @@ $result_trees{'combined_fonts'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1205,9 +1199,7 @@ $result_trees{'combined_fonts'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'combined_fonts'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'combined_fonts'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'combined_fonts'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'combined_fonts'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'combined_fonts'} = '@setfilename combined_fonts.info
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 563fb8b569..22fe8948c9 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -29,9 +29,6 @@ $result_trees{'complex_nestings'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'complex_nestings'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1161,9 +1155,7 @@ $result_trees{'complex_nestings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'complex_nestings'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'complex_nestings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex_nestings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'complex_nestings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex_nestings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
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 920e70e85f..f7c56d5467 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -71,9 +71,6 @@ $result_trees{'contents_at_document_begin'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'contents_at_document_begin'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -359,10 +353,8 @@ $result_trees{'contents_at_document_begin'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_document_begin'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_document_begin'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[3]{'args'}[0]{'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 2c8e362793..5826267053 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
@@ -71,9 +71,6 @@ $result_trees{'contents_at_document_begin_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'contents_at_document_begin_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -359,10 +353,8 @@ $result_trees{'contents_at_document_begin_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[3]{'args'}[0]{'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 e360274cc3..7c780317d1 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
@@ -71,9 +71,6 @@ $result_trees{'contents_at_document_begin_separate_element'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -359,10 +353,8 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 7fc08bacef..ff118f7027 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -35,9 +35,6 @@ $result_trees{'definition_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'definition_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -18435,9 +18429,7 @@ $result_trees{'definition_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'definition_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index ec37860798..7f8ddacfd3 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -29,9 +29,6 @@ $result_trees{'footnote_no_number'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'footnote_no_number'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -248,9 +242,7 @@ $result_trees{'footnote_no_number'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_no_number'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'footnote_no_number'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_no_number'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'footnote_no_number'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'footnote_no_number'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'footnote_no_number'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_no_number'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'footnote_no_number'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnote_no_number'} = '@node Top
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 4441bfcb3e..9eae346b0d 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -29,9 +29,6 @@ $result_trees{'footnote_no_number_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'footnote_no_number_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -248,9 +242,7 @@ $result_trees{'footnote_no_number_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_no_number_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_no_number_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_no_number_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnote_no_number_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'footnote_no_number_separate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_no_number_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_no_number_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnote_no_number_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnote_no_number_separate'} = '@node Top
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index a61b16d130..68ef4dea99 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -36,9 +36,6 @@ $result_trees{'form_feeds'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1170,9 +1167,6 @@ $result_trees{'form_feeds'} = {
           ],
           'extra' => {
             'float_type' => 'type',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'fl'
           },
           'info' => {
@@ -1230,9 +1224,6 @@ $result_trees{'form_feeds'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1257,7 +1248,6 @@ $result_trees{'form_feeds'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'form_feeds'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'form_feeds'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'form_feeds'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'form_feeds'}{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1275,8 +1265,6 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1]{'extra
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'caption'} 
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'shortcaption'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'extra'}{'node_content'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'args'}[1]{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'form_feeds'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'form_feeds'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'form_feeds'} = '@node Top
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 84695c4b21..5429354c76 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -75,9 +75,6 @@ $result_trees{'frenchspacing_and_code'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,9 +152,6 @@ $result_trees{'frenchspacing_and_code'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -964,9 +958,6 @@ $result_trees{'frenchspacing_and_code'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1718,9 +1709,7 @@ $result_trees{'frenchspacing_and_code'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'frenchspacing_and_code'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'frenchspacing_and_code'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1741,7 +1730,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
-$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 77dd2ae958..371df5a8c0 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -29,9 +29,6 @@ $result_trees{'image_formatting'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'image_formatting'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1886,9 +1880,7 @@ $result_trees{'image_formatting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'image_formatting'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'image_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'image_formatting'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'image_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'image_formatting'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'image_formatting'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'image_formatting'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'image_formatting'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'image_formatting'} = '@node Top
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 91bcee3fb4..2c81db039c 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -29,9 +29,6 @@ $result_trees{'index_entry_in_preformatted'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'index_entry_in_preformatted'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -376,9 +370,7 @@ $result_trees{'index_entry_in_preformatted'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index c7cc0a31b2..5d1fc5b89b 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -50,9 +50,6 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3851,9 +3845,6 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4042,9 +4033,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -4118,7 +4107,6 @@ 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'c
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'indices_in_begin_tables_lists'} = '\\input texinfo.tex
diff --git 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index a9296246fc..ef3cbdf83a 100644
--- 
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++ 
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -50,9 +50,6 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3855,9 +3849,6 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4046,9 +4037,7 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
@@ -4122,7 +4111,6 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'indices_in_begin_tables_lists_entries_after_item'} = '\\input 
texinfo.tex
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 9d44f337d6..714c59b257 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -80,9 +80,6 @@ $result_trees{'non_empty_part'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -457,9 +454,6 @@ $result_trees{'non_empty_part'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -789,9 +783,6 @@ $result_trees{'non_empty_part'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -855,17 +846,14 @@ $result_trees{'non_empty_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_empty_part'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'non_empty_part'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'non_empty_part'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$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]{'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'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'non_empty_part'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'non_empty_part'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 $result_trees{'non_empty_part'}{'contents'}[9]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[8];
 $result_trees{'non_empty_part'}{'contents'}[12]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[11];
-$result_trees{'non_empty_part'}{'contents'}[14]{'extra'}{'node_content'}[0] = 
$result_trees{'non_empty_part'}{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part'}{'contents'}[14]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'non_empty_part'}{'contents'}[14]{'args'}[0]{'contents'}[0];
 $result_trees{'non_empty_part'}{'contents'}[15]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[13];
 
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 facfd6fa7c..3d12282eb9 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
@@ -80,9 +80,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -457,9 +454,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -788,9 +782,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -854,17 +845,14 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$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]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$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];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[12]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[11];
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[14]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[15]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[13];
 
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 9b3f6e60f9..49d72895b7 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -35,9 +35,6 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +113,6 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -672,9 +666,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5];
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 9fba22986c..85592760b4 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -51,9 +51,6 @@ $result_trees{'ref_in_sectioning'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -114,9 +111,6 @@ $result_trees{'ref_in_sectioning'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -547,9 +541,6 @@ $result_trees{'ref_in_sectioning'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1781,9 +1772,7 @@ $result_trees{'ref_in_sectioning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_sectioning'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'ref_in_sectioning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_sectioning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'};
@@ -1793,7 +1782,6 @@ 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'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'}[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'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'ref_in_sectioning'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_sectioning'}{'contents'}[5]{'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'};
 
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index c56062293e..5340e0ae68 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -99,9 +99,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'a-in-copying'
                       },
                       'source_info' => {
@@ -187,9 +184,6 @@ $result_trees{'references_to_top_no_top_output'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -262,9 +256,6 @@ $result_trees{'references_to_top_no_top_output'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'a-in-top'
           },
           'source_info' => {
@@ -301,9 +292,6 @@ $result_trees{'references_to_top_no_top_output'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'a-in-paragraph-in-top'
               },
               'source_info' => {
@@ -348,9 +336,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'a-in-footnote'
                           },
                           'source_info' => {
@@ -454,9 +439,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'a-in-float'
                   },
                   'source_info' => {
@@ -494,9 +476,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'a-in-caption'
                           },
                           'source_info' => {
@@ -564,9 +543,6 @@ $result_trees{'references_to_top_no_top_output'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'list',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'My-Flist'
           },
           'info' => {
@@ -676,9 +652,6 @@ $result_trees{'references_to_top_no_top_output'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1110,9 +1083,6 @@ $result_trees{'references_to_top_no_top_output'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'list',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Main-Flist'
           },
           'info' => {
@@ -1179,21 +1149,12 @@ $result_trees{'references_to_top_no_top_output'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'args'}[1]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1212,7 +1173,6 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
 $result_texis{'references_to_top_no_top_output'} = '
 @setfilename references_to_top_no_top_output.info
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index 1be6c3c778..253ce2f666 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -29,9 +29,6 @@ $result_trees{'refs_formatting'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2932,7 +2929,6 @@ $result_trees{'refs_formatting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'refs_formatting'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'refs_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'refs_formatting'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'refs_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'refs_formatting'}{'contents'}[1];
 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/setfilename_no_extension.pl 
b/tp/t/results/converters_tests/setfilename_no_extension.pl
index 328966b253..9d95970b85 100644
--- a/tp/t/results/converters_tests/setfilename_no_extension.pl
+++ b/tp/t/results/converters_tests/setfilename_no_extension.pl
@@ -73,9 +73,6 @@ $result_trees{'setfilename_no_extension'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -169,9 +166,6 @@ $result_trees{'setfilename_no_extension'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -196,9 +190,7 @@ $result_trees{'setfilename_no_extension'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'setfilename_no_extension'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'setfilename_no_extension'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'setfilename_no_extension'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'setfilename_no_extension'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'setfilename_no_extension'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'setfilename_no_extension'} = '@setfilename 
setfilename_no_extension
diff --git a/tp/t/results/converters_tests/simplest_test_prefix.pl 
b/tp/t/results/converters_tests/simplest_test_prefix.pl
index b9a3651ed4..af2cc3332d 100644
--- a/tp/t/results/converters_tests/simplest_test_prefix.pl
+++ b/tp/t/results/converters_tests/simplest_test_prefix.pl
@@ -77,9 +77,6 @@ $result_trees{'simplest_test_prefix'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -114,7 +111,6 @@ $result_trees{'simplest_test_prefix'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simplest_test_prefix'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simplest_test_prefix'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simplest_test_prefix'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simplest_test_prefix'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'simplest_test_prefix'} = '\\input texinfo @c -*-texinfo-*-
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 b2e69797f8..2c4673d9e4 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
@@ -36,9 +36,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -693,22 +690,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1483,7 +1464,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -1499,20 +1479,6 @@ 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'co
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[13];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'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 e162ac00be..d3ea1b5355 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
@@ -261,9 +261,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -621,7 +618,6 @@ 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[1];
@@ -872,11 +868,11 @@ 
$result_converted{'docbook'}->{'spaces_in_empty_node_names'} = '
 
 
 $result_converted{'latex_text'}->{'spaces_in_empty_node_names'} = 
'\\label{anchor:Top}%
-\\label{anchor:}%
+\\label{anchor:-}%
 
-\\label{anchor:}%
+\\label{anchor:-}%
 
-\\label{anchor:}%
+\\label{anchor:-}%
 
 \\ {}\\ {}
 
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 0dc2601ef8..b93e7122c7 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -273,9 +273,6 @@ $result_trees{'spaces_in_node_names'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -329,11 +326,6 @@ $result_trees{'spaces_in_node_names'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -405,10 +397,6 @@ $result_trees{'spaces_in_node_names'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -643,10 +631,6 @@ $result_trees{'spaces_in_node_names'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -679,16 +663,10 @@ 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[2]{'extra'}{'node_content'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'spaces_in_node_names'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'spaces_in_node_names'}{'contents'}[2];
@@ -701,8 +679,6 @@ 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'spaces_in_node_names'}{'contents'}[4];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'extra'}{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'args'}[0]{'contents'}[1];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'args'}[0]{'contents'}[1];
 
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 6388c95c40..2eb7773d6a 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -107,9 +107,6 @@ $result_trees{'test_deftypefnnewline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -187,9 +184,6 @@ $result_trees{'test_deftypefnnewline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2505,9 +2499,7 @@ $result_trees{'test_deftypefnnewline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index a4b2f7114e..621700302b 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -39,9 +39,6 @@ $result_trees{'things_before_setfilename'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'An-anchor'
               },
               'source_info' => {
@@ -137,9 +134,6 @@ $result_trees{'things_before_setfilename'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'Anchor-in-footnote'
                       },
                       'source_info' => {
@@ -336,9 +330,6 @@ $result_trees{'things_before_setfilename'} = {
               ],
               'extra' => {
                 'float_type' => '',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'float-anchor'
               },
               'info' => {
@@ -513,9 +504,6 @@ $result_trees{'things_before_setfilename'} = {
               'extra' => {
                 'caption' => {},
                 'float_type' => 'Text',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'ta'
               },
               'info' => {
@@ -846,9 +834,6 @@ $result_trees{'things_before_setfilename'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -926,9 +911,6 @@ $result_trees{'things_before_setfilename'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1080,25 +1062,19 @@ $result_trees{'things_before_setfilename'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
 
$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'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[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'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'things_before_setfilename'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$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 2c904c8364..045de4506c 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
@@ -39,9 +39,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'An-anchor'
               },
               'source_info' => {
@@ -137,9 +134,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'Anchor-in-footnote'
                       },
                       'source_info' => {
@@ -336,9 +330,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
               ],
               'extra' => {
                 'float_type' => '',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'float-anchor'
               },
               'info' => {
@@ -513,9 +504,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'extra' => {
                 'caption' => {},
                 'float_type' => 'Text',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'ta'
               },
               'info' => {
@@ -920,20 +908,16 @@ $result_trees{'things_before_setfilename_no_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'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'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'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'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[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'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[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'}[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];
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index d713ed3d4a..5fdfd4ccd2 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -36,9 +36,6 @@ $result_trees{'top_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2925,9 +2922,6 @@ $result_trees{'top_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2952,7 +2946,6 @@ $result_trees{'top_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_in_ref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'top_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_in_ref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'top_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'top_in_ref'}{'contents'}[1];
 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -3003,7 +2996,6 @@ 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'
 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'top_in_ref'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_in_ref'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'top_in_ref'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_in_ref'} = '@node Top
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 42ba0fd880..9ce5999700 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -288,9 +288,6 @@ $result_trees{'block_commands'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'a float',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'b-float'
           },
           'info' => {
@@ -312,7 +309,6 @@ $result_trees{'block_commands'} = {
 };
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'caption'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
 $result_texis{'block_commands'} = '
 @group
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index cc3bfabdda..26bcc2ab7b 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -37,9 +37,6 @@ $result_trees{'punctuation_in_line_commands'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -413,9 +410,6 @@ $result_trees{'punctuation_in_line_commands'} = {
           'extra' => {
             'float_section' => {},
             'float_type' => 'float type! After punc',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float-label_0021-After-punc',
             'shortcaption' => {}
           },
@@ -542,9 +536,6 @@ $result_trees{'punctuation_in_line_commands'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'float type! After punc',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label-with-caption'
           },
           'info' => {
@@ -814,17 +805,14 @@ $result_trees{'punctuation_in_line_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
 
diff --git a/tp/t/results/coverage_braces/brace_opened_no_command.pl 
b/tp/t/results/coverage_braces/brace_opened_no_command.pl
index 9aab5e4f29..4dc4c20661 100644
--- a/tp/t/results/coverage_braces/brace_opened_no_command.pl
+++ b/tp/t/results/coverage_braces/brace_opened_no_command.pl
@@ -33,9 +33,6 @@ $result_trees{'brace_opened_no_command'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'truc'
               },
               'source_info' => {
@@ -66,7 +63,6 @@ $result_trees{'brace_opened_no_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'brace_opened_no_command'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'brace_opened_no_command'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'brace_opened_no_command'} = 'anchortruc@} @anchor{truc}.
 @bye';
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl 
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index f0f2ec077b..4c30144d2f 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -29,9 +29,6 @@ $result_trees{'contain_plain_text_nestings'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -110,9 +107,6 @@ $result_trees{'contain_plain_text_nestings'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -740,9 +734,7 @@ $result_trees{'contain_plain_text_nestings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2];
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl 
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index b1a992e3b5..de31ed1041 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -26,10 +26,6 @@ $result_trees{'end_line_in_anchor'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {},
-              {}
-            ],
             'normalized' => 'an-anchor'
           },
           'source_info' => {
@@ -49,8 +45,6 @@ $result_trees{'end_line_in_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
 $result_texis{'end_line_in_anchor'} = '@anchor{an
 anchor}
diff --git a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl 
b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
index 5855306e78..6be4bfdb50 100644
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -45,9 +45,6 @@ $result_trees{'form_feed_in_brace_commands'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'aa'
               },
               'source_info' => {
@@ -201,7 +198,6 @@ $result_trees{'form_feed_in_brace_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'form_feed_in_brace_commands'} = '@option{ aa} @anchor{aa}
something @email{aaa,  fff}@footnote{ 
  f1 } @footnote{  ggjj}.
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index aa27277703..fabde50de2 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -96,9 +96,6 @@ $result_trees{'inforef_too_much_args'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -124,7 +121,6 @@ $result_trees{'inforef_too_much_args'} = {
   'type' => 'document_root'
 };
 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inforef_too_much_args'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'inforef_too_much_args'} = '@node chapter
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl 
b/tp/t/results/coverage_braces/space_in_anchor.pl
index cfdad97326..6c5a4c1f1e 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -30,9 +30,6 @@ $result_trees{'space_in_anchor'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'anchor-name'
           },
           'source_info' => {
@@ -56,7 +53,6 @@ $result_trees{'space_in_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_anchor'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_anchor'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'space_in_anchor'} = '@anchor{   anchor  name   }.
 ';
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 17483411c7..8594e6f650 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -622,9 +622,6 @@ $result_trees{'test_image'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2669,9 +2666,6 @@ $result_trees{'test_image'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'Image',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Image-with-commands'
           },
           'info' => {
@@ -2729,9 +2723,6 @@ $result_trees{'test_image'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2756,12 +2747,9 @@ $result_trees{'test_image'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_image'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'test_image'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_image'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'contents'}[6]{'extra'}{'float'}
 = $result_trees{'test_image'}{'contents'}[2]{'contents'}[11];
 $result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'extra'}{'caption'} 
= $result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'contents'}[6];
-$result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_image'}{'contents'}[2]{'contents'}[11]{'args'}[1]{'contents'}[0];
-$result_trees{'test_image'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'test_image'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_image'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_image'} = '@macro files-char
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 d9dd4364ee..e04f9fe97d 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -35,9 +35,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -329,9 +326,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -501,10 +495,8 @@ $result_trees{'two_footnotes_in_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes'} = '@node Top
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index 5f2ab47e01..0af32dd181 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
@@ -70,9 +70,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -364,9 +361,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -536,10 +530,8 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes_separate'} = '@footnotestyle separate
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 91d2d39bc7..c1d083d4b8 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -22,9 +22,6 @@ $result_trees{'verb_in_xref'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'point'
           },
           'source_info' => {
@@ -132,7 +129,6 @@ $result_trees{'verb_in_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'verb_in_xref'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index c4fa81f027..23a199925e 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -29,9 +29,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -12280,9 +12277,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -12307,7 +12301,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -12669,7 +12662,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[93]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'all_commands_delimiters_printindex'} = '@node Top
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index e79f579586..17644b4b11 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -29,9 +29,6 @@ $result_trees{'all_commands_printindex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4330,9 +4327,6 @@ $result_trees{'all_commands_printindex'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4357,7 +4351,6 @@ $result_trees{'all_commands_printindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4547,7 +4540,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'all_commands_printindex'} = '@node Top
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 49ed1ec831..186c72afce 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -36,9 +36,6 @@ $result_trees{'omit_def_space'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -379,9 +376,6 @@ $result_trees{'omit_def_space'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -406,7 +400,6 @@ $result_trees{'omit_def_space'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'omit_def_space'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -418,7 +411,6 @@ 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'ex
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'omit_def_space'} = '@node Top
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 30caa6e9e6..54657f1e1c 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -75,9 +75,6 @@ $result_trees{'ref_in_def'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'myanchor'
                           },
                           'source_info' => {
@@ -578,9 +575,6 @@ $result_trees{'ref_in_def'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -605,7 +599,6 @@ $result_trees{'ref_in_def'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -636,7 +629,6 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[3] = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'};
-$result_trees{'ref_in_def'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_in_def'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_def'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ref_in_def'} = '
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index 02602136f9..53c99ec653 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -29,9 +29,6 @@ $result_trees{'space_in_def_for_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -397,9 +394,6 @@ $result_trees{'space_in_def_for_index'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -424,7 +418,6 @@ $result_trees{'space_in_def_for_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -436,7 +429,6 @@ 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_in_def_for_index'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'space_in_def_for_index'} = '@node Top
diff --git a/tp/t/results/docbook_tests/between_node_and_section.pl 
b/tp/t/results/docbook_tests/between_node_and_section.pl
index 99ecb98d72..a3303baa73 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -36,9 +36,6 @@ $result_trees{'between_node_and_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +113,6 @@ $result_trees{'between_node_and_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -209,9 +203,6 @@ $result_trees{'between_node_and_section'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Old-name'
           },
           'source_info' => {
@@ -227,9 +218,6 @@ $result_trees{'between_node_and_section'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -284,12 +272,8 @@ $result_trees{'between_node_and_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'between_node_and_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'between_node_and_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'between_node_and_section'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'between_node_and_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'between_node_and_section'}{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'between_node_and_section'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'between_node_and_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'between_node_and_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'between_node_and_section'} = '
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index eced6e823f..0f53319ca1 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -68,9 +68,6 @@ $result_trees{'multiple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -148,9 +145,6 @@ $result_trees{'multiple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -260,9 +254,6 @@ $result_trees{'multiple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -372,9 +363,6 @@ $result_trees{'multiple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -484,9 +472,6 @@ $result_trees{'multiple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -548,15 +533,10 @@ $result_trees{'multiple_documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_documentlanguage'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_documentlanguage'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_documentlanguage'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
 $result_texis{'multiple_documentlanguage'} = '@documentlanguage ja
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 1de2504946..b0a437d671 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -29,9 +29,6 @@ $result_trees{'special_docbook_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -373,9 +370,6 @@ $result_trees{'special_docbook_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -467,9 +461,6 @@ $result_trees{'special_docbook_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -561,9 +552,6 @@ $result_trees{'special_docbook_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -655,9 +643,6 @@ $result_trees{'special_docbook_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -728,19 +713,14 @@ $result_trees{'special_docbook_unnumbered'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'special_docbook_unnumbered'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
 $result_texis{'special_docbook_unnumbered'} = '@node Top
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index bb82e21721..1ccd78afa3 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -35,9 +35,6 @@ $result_trees{'anchor_in_caption'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -181,9 +178,6 @@ $result_trees{'anchor_in_caption'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'in-anchor'
                           },
                           'source_info' => {
@@ -250,9 +244,6 @@ $result_trees{'anchor_in_caption'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'fl',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label'
           },
           'info' => {
@@ -268,9 +259,6 @@ $result_trees{'anchor_in_caption'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -295,13 +283,9 @@ $result_trees{'anchor_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_caption'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'anchor_in_caption'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_caption'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_caption'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_caption'} = '@node Top
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index b70ba3ad70..d54d557df2 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -35,9 +35,6 @@ $result_trees{'cindex_in_caption'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -266,9 +263,6 @@ $result_trees{'cindex_in_caption'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'fl',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label'
           },
           'info' => {
@@ -329,9 +323,6 @@ $result_trees{'cindex_in_caption'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -356,14 +347,11 @@ $result_trees{'cindex_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cindex_in_caption'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'cindex_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cindex_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'cindex_in_caption'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cindex_in_caption'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cindex_in_caption'} = '@node Top
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index f688021bdb..722a5c1963 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -35,9 +35,6 @@ $result_trees{'comment_space_comand_in_float'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -175,10 +172,6 @@ $result_trees{'comment_space_comand_in_float'} = {
           ],
           'extra' => {
             'float_type' => 'Text  ',
-            'node_content' => [
-              {},
-              {}
-            ],
             'normalized' => 'label-'
           },
           'info' => {
@@ -246,9 +239,6 @@ $result_trees{'comment_space_comand_in_float'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -273,11 +263,7 @@ $result_trees{'comment_space_comand_in_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'comment_space_comand_in_float'} = '@node Top
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 107d248e98..f9c4a338b0 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -35,9 +35,6 @@ $result_trees{'complex_float'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1164,9 +1161,6 @@ $result_trees{'complex_float'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'Anchor-in-caption'
                       },
                       'source_info' => {
@@ -2318,9 +2312,6 @@ $result_trees{'complex_float'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'text-with-a-lot-of-features',
             'shortcaption' => {}
           },
@@ -2372,9 +2363,6 @@ $result_trees{'complex_float'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3118,9 +3106,6 @@ $result_trees{'complex_float'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'Anchor-in-caption-2'
                       },
                       'source_info' => {
@@ -3499,9 +3484,6 @@ $result_trees{'complex_float'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption'
           },
           'info' => {
@@ -3577,7 +3559,6 @@ $result_trees{'complex_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'complex_float'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'complex_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
@@ -3586,7 +3567,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'ext
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[2]{'contents'}[0];
@@ -3599,9 +3579,7 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'ex
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[2];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'shortcaption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20];
-$result_trees{'complex_float'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'complex_float'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex_float'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0];
@@ -3609,13 +3587,11 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index 7ca0f4389a..55de46b88f 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -109,9 +109,6 @@ $result_trees{'empty_caption'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'a',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'b'
           },
           'info' => {
@@ -220,9 +217,6 @@ $result_trees{'empty_caption'} = {
           ],
           'extra' => {
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'c',
             'shortcaption' => {}
           },
@@ -359,9 +353,7 @@ $result_trees{'empty_caption'} = {
 };
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
-$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'shortcaption'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 18a8b7d585..cbc8c56091 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -92,9 +92,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           ],
           'extra' => {
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label1'
           },
           'info' => {
@@ -214,9 +211,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           'extra' => {
             'caption' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label2'
           },
           'info' => {
@@ -435,10 +429,8 @@ $result_trees{'empty_listoffloats_with_floats'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'extra'}{'caption'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 5f881e8608..11fe033f53 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -118,9 +118,6 @@ $result_trees{'float_copying'} = {
                                               ],
                                               'cmdname' => 'anchor',
                                               'extra' => {
-                                                'node_content' => [
-                                                  {}
-                                                ],
                                                 'normalized' => 
'caption-copying-footnote-anchor'
                                               },
                                               'source_info' => {
@@ -263,9 +260,6 @@ $result_trees{'float_copying'} = {
                                                   'cmdname' => 'node',
                                                   'extra' => {
                                                     'isindex' => 1,
-                                                    'node_content' => [
-                                                      {}
-                                                    ],
                                                     'nodes_manuals' => [
                                                       {
                                                         'node_content' => [
@@ -357,9 +351,6 @@ $result_trees{'float_copying'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'public-domain-anchor'
                               },
                               'source_info' => {
@@ -506,9 +497,6 @@ $result_trees{'float_copying'} = {
                   'extra' => {
                     'caption' => {},
                     'float_type' => 'Copyright notice',
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'public-domain'
                   },
                   'info' => {
@@ -591,9 +579,6 @@ $result_trees{'float_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -959,19 +944,14 @@ $result_trees{'float_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'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'}{'extra'}{'node_content'}[0]
 = 
$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'}{'args'}[0]{'contents'}[0];
 
$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'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$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'}{'args'}[0]{'contents'}[0];
 
$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'}{'node_argument'}{'node_content'}[0]
 = 
$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]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$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'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'float_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'float_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[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'};
diff --git a/tp/t/results/float/float_in_block_commands.pl 
b/tp/t/results/float/float_in_block_commands.pl
index 846395b6fd..16acd91917 100644
--- a/tp/t/results/float/float_in_block_commands.pl
+++ b/tp/t/results/float/float_in_block_commands.pl
@@ -132,9 +132,6 @@ $result_trees{'float_in_block_commands'} = {
               'extra' => {
                 'caption' => {},
                 'float_type' => 'Text',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'in-example'
               },
               'info' => {
@@ -303,9 +300,6 @@ $result_trees{'float_in_block_commands'} = {
               'extra' => {
                 'caption' => {},
                 'float_type' => 'Text',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'in-quotation'
               },
               'info' => {
@@ -474,9 +468,6 @@ $result_trees{'float_in_block_commands'} = {
               'extra' => {
                 'caption' => {},
                 'float_type' => 'Text',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'in-cartouche'
               },
               'info' => {
@@ -542,13 +533,10 @@ $result_trees{'float_in_block_commands'} = {
 };
 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'float'}
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'caption'}
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'float'}
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'caption'}
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'float'}
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'caption'}
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_in_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
 $result_texis{'float_in_block_commands'} = '@example
 @float Text, in example
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index 3dd535f89d..f211afd75a 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -276,13 +276,6 @@ $result_trees{'float_with_at_commands'} = {
           'extra' => {
             'caption' => {},
             'float_type' => "entr\x{e9}e",
-            'node_content' => [
-              {},
-              {},
-              {},
-              {},
-              {}
-            ],
             'normalized' => 'premi_00e8re-entr_00e9e'
           },
           'info' => {
@@ -367,11 +360,6 @@ $result_trees{'float_with_at_commands'} = {
 };
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
-$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3];
-$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[4];
 
 $result_texis{'float_with_at_commands'} = '@float entr@\'ee, premi@`ere 
entr@\'ee
 
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 83342d5f4a..95f08245c7 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -35,9 +35,6 @@ $result_trees{'footnote_in_caption'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -249,9 +246,6 @@ $result_trees{'footnote_in_caption'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'fl',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label'
           },
           'info' => {
@@ -267,9 +261,6 @@ $result_trees{'footnote_in_caption'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -294,12 +285,9 @@ $result_trees{'footnote_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_in_caption'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'footnote_in_caption'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnote_in_caption'} = '@node Top
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl 
b/tp/t/results/float/footnote_in_caption_and_error.pl
index 5528366254..9ae8bd8f73 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -35,9 +35,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -257,9 +254,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'fl',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label'
           },
           'info' => {
@@ -275,9 +269,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,12 +293,9 @@ $result_trees{'footnote_in_caption_and_error'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnote_in_caption_and_error'} = '@node Top
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 3ba9c23d9a..605393d4c1 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -35,9 +35,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -248,9 +245,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'text-with-a-lot-of-features',
             'shortcaption' => {}
           },
@@ -555,9 +549,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label-but-no-type',
             'shortcaption' => {}
           },
@@ -654,9 +645,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'extra' => {
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label-but-no-type-and-no-caption'
           },
           'info' => {
@@ -1026,9 +1014,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label-but-no-type-2',
             'shortcaption' => {}
           },
@@ -1191,9 +1176,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Warning',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'warning-in-top',
             'shortcaption' => {}
           },
@@ -1543,9 +1525,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1703,9 +1682,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'text-in-chapter'
           },
           'info' => {
@@ -1840,9 +1816,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption'
           },
           'info' => {
@@ -2099,9 +2072,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => "th\x{e9}or\x{e8}me",
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'theoreme'
           },
           'info' => {
@@ -2255,9 +2225,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label-but-no-type-in-chapter',
             'shortcaption' => {}
           },
@@ -2420,9 +2387,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Warning',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'warning-in-chapter',
             'shortcaption' => {}
           },
@@ -2580,9 +2544,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2713,9 +2674,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           'extra' => {
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'text-in-section'
           },
           'info' => {
@@ -2766,9 +2724,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3053,9 +3008,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'unnumbered-float',
             'shortcaption' => {}
           },
@@ -3205,9 +3157,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label-but-no-type-in-unnumbered',
             'shortcaption' => {}
           },
@@ -3264,9 +3213,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3455,9 +3401,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Section-within-unnumbered-float',
             'shortcaption' => {}
           },
@@ -3509,9 +3452,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3796,9 +3736,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Chapter-with-subsec-float',
             'shortcaption' => {}
           },
@@ -3850,9 +3787,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4036,9 +3970,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'unnumbered-sec-float',
             'shortcaption' => {}
           },
@@ -4193,9 +4124,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 
'label-but-no-type-in-unnumbered-subsec-in-chapter',
             'shortcaption' => {}
           },
@@ -4247,9 +4175,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4438,9 +4363,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'appendix-sec-float',
             'shortcaption' => {}
           },
@@ -4492,9 +4414,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5083,13 +5002,11 @@ $result_trees{'numbering_captions_listoffloats'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
@@ -5100,10 +5017,8 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
@@ -5114,105 +5029,82 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4]{'extra'}{'float'}
 = 
$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'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[3]{'args'}[0]{'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];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'float'}
 = 
$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'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
 
$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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[5]{'args'}[0]{'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'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$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'}[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];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
 = 
$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'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$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'}[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];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 55a9a3914c..c6bd78598f 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -87,9 +87,6 @@ $result_trees{'ref_to_float'} = {
           ],
           'extra' => {
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Label1'
           },
           'info' => {
@@ -177,9 +174,6 @@ $result_trees{'ref_to_float'} = {
           ],
           'extra' => {
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Label2'
           },
           'info' => {
@@ -281,8 +275,6 @@ $result_trees{'ref_to_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 66ab0562a3..221901588d 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -118,9 +118,6 @@ $result_trees{'simple'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'Type',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Label'
           },
           'info' => {
@@ -142,7 +139,6 @@ $result_trees{'simple'} = {
 };
 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'simple'}{'contents'}[0]{'contents'}[1];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'} = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
 $result_texis{'simple'} = '@float Type, Label
 
diff --git a/tp/t/results/float/special_characters_in_float_type.pl 
b/tp/t/results/float/special_characters_in_float_type.pl
index 755b439d88..4ec8f21e2f 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -35,9 +35,6 @@ $result_trees{'special_characters_in_float_type'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'special_characters_in_float_type'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -342,12 +336,6 @@ $result_trees{'special_characters_in_float_type'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'A < " `` ` \' \' \\aaa . --- in var',
-            'node_content' => [
-              {},
-              {},
-              {},
-              {}
-            ],
             'normalized' => 
'L-_003c-_0022-_0060_0060-_0060-_0027-_0027-_005caaa-_002e-_002d_002d_002d-in-var'
           },
           'info' => {
@@ -438,17 +426,11 @@ $result_trees{'special_characters_in_float_type'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'special_characters_in_float_type'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_characters_in_float_type'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'special_characters_in_float_type'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_characters_in_float_type'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'special_characters_in_float_type'}{'contents'}[4];
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[2];
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[3];
 
 $result_texis{'special_characters_in_float_type'} = '@node Top
 @top top
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 75ded91497..40929239c8 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -35,9 +35,6 @@ $result_trees{'accent'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2125,7 +2122,6 @@ $result_trees{'accent'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'accent'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'accent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'accent'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'accent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'accent'} = '@node first
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 0cec20ea59..410f3a1590 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -35,9 +35,6 @@ $result_trees{'accent_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2125,7 +2122,6 @@ $result_trees{'accent_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'accent_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'accent_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'accent_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'accent_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'accent_enable_encoding'} = '@node first
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 027e55b1b5..fe943770bd 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -75,9 +75,6 @@ $result_trees{'accentenc'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2165,7 +2162,6 @@ $result_trees{'accentenc'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'accentenc'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'accentenc'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'accentenc'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'accentenc'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'accentenc'} = '@documentencoding ISO-8859-1
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 101456e1d5..d355972156 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -70,9 +70,6 @@ $result_trees{'accentenc_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2160,7 +2157,6 @@ $result_trees{'accentenc_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'accentenc_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'accentenc_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'accentenc_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'accentenc_enable_encoding'} = '@documentencoding ISO-8859-1
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 6d8ee3efe6..ac5a0811d6 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -35,9 +35,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3968,13 +3965,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4116,25 +4106,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4350,17 +4321,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4626,21 +4586,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4926,19 +4871,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5158,13 +5090,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5394,21 +5319,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5678,17 +5588,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6066,35 +5965,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6656,29 +6526,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7157,21 +7004,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7489,13 +7321,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7754,19 +7579,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8034,19 +7846,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8224,9 +8023,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8374,13 +8170,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8633,13 +8422,6 @@ $result_trees{'at_commands_in_refs'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8894,11 +8676,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9144,11 +8921,6 @@ $result_trees{'at_commands_in_refs'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9394,9 +9166,6 @@ $result_trees{'at_commands_in_refs'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9760,25 +9529,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10256,21 +10006,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10537,10 +10272,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10673,11 +10404,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10808,9 +10534,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10939,11 +10662,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -11140,13 +10858,6 @@ $result_trees{'at_commands_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -15031,7 +14742,6 @@ $result_trees{'at_commands_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -15265,33 +14975,11 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[16];
 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[2];
@@ -15309,15 +14997,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]
 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[14];
 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[15];
 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[2];
@@ -15327,19 +15006,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]
 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[6];
 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[7];
 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[2];
@@ -15353,17 +15019,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]
 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[2];
@@ -15375,29 +15030,11 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[13]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[2];
@@ -15411,15 +15048,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[15]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[2];
@@ -15429,33 +15057,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[6];
 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[7];
 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[17]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[26];
 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[2];
@@ -15483,27 +15084,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[24];
 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[25];
 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[19]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[20];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[2];
@@ -15525,19 +15105,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[18];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[19];
 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[21]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[2];
@@ -15551,27 +15118,11 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[23]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[25]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[2];
@@ -15583,17 +15134,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[27]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[2];
@@ -15605,59 +15145,24 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[29]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[31]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[33]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[35]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[37]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[37]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[37]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[37]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[39]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[39]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[39]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[39]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[41]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[41]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[41]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[16];
 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[2];
@@ -15675,19 +15180,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[14];
 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[15];
 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[43]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[2];
@@ -15701,29 +15193,15 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0
 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[45]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[47]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[47]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[47]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[47]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[49]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[49]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[49]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[49]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[51]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[51]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[51]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[51]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[53]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[53]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[53]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[53]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[55]{'args'}[0]{'contents'}[2];
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 959a167da9..1d808b9bd3 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
@@ -107,9 +107,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4040,13 +4037,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4188,25 +4178,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4422,17 +4393,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4698,21 +4658,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4998,19 +4943,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5230,13 +5162,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5466,21 +5391,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5750,17 +5660,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6138,35 +6037,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6728,29 +6598,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7229,21 +7076,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7561,13 +7393,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7826,19 +7651,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8106,19 +7918,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8296,9 +8095,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8446,13 +8242,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8705,13 +8494,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8966,11 +8748,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9216,11 +8993,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9466,9 +9238,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9832,25 +9601,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10328,21 +10078,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10609,10 +10344,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10745,11 +10476,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10880,9 +10606,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -11011,11 +10734,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -11212,13 +10930,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -15103,7 +14814,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -15337,33 +15047,11 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'conte
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[16];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[2];
@@ -15381,15 +15069,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manua
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[14];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[15];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[5]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[2];
@@ -15399,19 +15078,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manua
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[6];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[7];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[7]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[2];
@@ -15425,17 +15091,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manua
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[9]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[2];
@@ -15447,29 +15102,11 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[11]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[13]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[2];
@@ -15483,15 +15120,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[15]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[2];
@@ -15501,33 +15129,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[6];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[7];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[17]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[26];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[2];
@@ -15555,27 +15156,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[24];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[25];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[19]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[20];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[2];
@@ -15597,19 +15177,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[18];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[19];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[21]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[2];
@@ -15623,27 +15190,11 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[23]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[25]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[2];
@@ -15655,17 +15206,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[27]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[2];
@@ -15677,59 +15217,24 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[29]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[31]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[31]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[31]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[33]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[35]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[37]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[39]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[41]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[41]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[41]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[16];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[2];
@@ -15747,19 +15252,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[14];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[15];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[43]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[2];
@@ -15773,29 +15265,15 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manu
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[45]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[47]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[49]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[51]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[51]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[51]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[51]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[53]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[55]{'args'}[0]{'contents'}[2];
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 fcc795aebf..bc88d65abb 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
@@ -107,9 +107,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4040,13 +4037,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4188,25 +4178,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4422,17 +4393,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4698,21 +4658,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4998,19 +4943,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5230,13 +5162,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5466,21 +5391,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5750,17 +5660,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6138,35 +6037,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6728,29 +6598,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7229,21 +7076,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7561,13 +7393,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -7826,19 +7651,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8106,19 +7918,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8296,9 +8095,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8446,13 +8242,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8705,13 +8494,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -8966,11 +8748,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9216,11 +8993,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9466,9 +9238,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -9832,25 +9601,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10328,21 +10078,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10609,10 +10344,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10745,11 +10476,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -10880,9 +10606,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -11011,11 +10734,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -11212,13 +10930,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -15103,7 +14814,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -15337,33 +15047,11 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'content
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[16];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[2];
@@ -15381,15 +15069,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[14];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[15];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[2];
@@ -15399,19 +15078,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[6];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[7];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[2];
@@ -15425,17 +15091,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[9]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[2];
@@ -15447,29 +15102,11 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[11]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[13]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[2];
@@ -15483,15 +15120,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[15]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[2];
@@ -15501,33 +15129,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[6];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[7];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[17]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[26];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[2];
@@ -15555,27 +15156,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[24];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[25];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[19]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[20];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[2];
@@ -15597,19 +15177,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[18];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[19];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[21]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[2];
@@ -15623,27 +15190,11 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[23]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[25]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[2];
@@ -15655,17 +15206,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[27]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[2];
@@ -15677,59 +15217,24 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[8];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[9];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[29]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[31]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[31]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[31]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[33]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[3];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[35]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[37]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[39]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[41]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[41]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[41]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[16];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[2];
@@ -15747,19 +15252,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[14];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[15];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[43]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[12];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[2];
@@ -15773,29 +15265,15 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manual
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[10];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[11];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[45]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[47]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[49]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[51]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[51]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[51]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[51]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'args'}[0]{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[53]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[4];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[55]{'args'}[0]{'contents'}[2];
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 0d34c83e9d..ffc995dd85 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
@@ -90,9 +90,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -469,9 +466,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -588,9 +582,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -668,9 +659,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -748,9 +736,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -828,9 +813,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1306,22 +1288,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11]{'args'}[0]{'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];
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 8601b7f952..2fe27bd282 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
@@ -91,9 +91,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -508,9 +505,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -588,9 +582,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -668,9 +659,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -748,9 +736,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -828,9 +813,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1306,22 +1288,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11]{'args'}[0]{'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];
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 943c2d301c..36ad8973e7 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
@@ -91,9 +91,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -173,9 +170,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -491,9 +485,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$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];
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 8885c86ec4..4a1d1f7c8f 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -188,9 +188,6 @@ $result_trees{'japanese_shift_jis'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -600,9 +597,6 @@ $result_trees{'japanese_shift_jis'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -699,9 +693,6 @@ $result_trees{'japanese_shift_jis'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -787,13 +778,10 @@ $result_trees{'japanese_shift_jis'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'japanese_shift_jis'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'japanese_shift_jis'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'japanese_shift_jis'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'japanese_shift_jis'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'japanese_shift_jis'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'japanese_shift_jis'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'japanese_shift_jis'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'japanese_shift_jis'}{'contents'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'japanese_shift_jis'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'japanese_shift_jis'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'japanese_shift_jis'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'japanese_shift_jis'} = '\\input texinfo @c -*- coding: utf-8; 
mode: texinfo; -*-
diff --git a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index 14e94f4b6c..9669d9ac4d 100644
--- a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
@@ -90,9 +90,6 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -177,9 +174,6 @@ $result_trees{'manual_simple_latin1_with_error'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -220,9 +214,6 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -296,11 +287,8 @@ $result_trees{'manual_simple_latin1_with_error'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'manual_simple_latin1_with_error'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'manual_simple_latin1_with_error'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'manual_simple_latin1_with_error'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'manual_simple_latin1_with_error'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'manual_simple_latin1_with_error'} = '\\input texinfo.tex
diff --git a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
index 40e6d86a4c..df12a58506 100644
--- a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -50,9 +50,6 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -137,9 +134,6 @@ $result_trees{'manual_simple_utf8_with_error'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -180,9 +174,6 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -256,11 +247,8 @@ $result_trees{'manual_simple_utf8_with_error'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'manual_simple_utf8_with_error'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'manual_simple_utf8_with_error'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'manual_simple_utf8_with_error'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'manual_simple_utf8_with_error'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'manual_simple_utf8_with_error'} = '\\input texinfo.tex
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 9e6650075f..e97f36bdf3 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -468,9 +468,6 @@ $result_trees{'sample_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -818,9 +815,6 @@ $result_trees{'sample_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1213,9 +1207,6 @@ $result_trees{'sample_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1308,9 +1299,6 @@ $result_trees{'sample_utf8'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1421,12 +1409,10 @@ $result_trees{'sample_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sample_utf8'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'sample_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sample_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'sample_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sample_utf8'}{'contents'}[3]{'args'}[0]{'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];
@@ -1436,9 +1422,7 @@ 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_nod
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[6];
-$result_trees{'sample_utf8'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'sample_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sample_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'sample_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sample_utf8'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
 $result_texis{'sample_utf8'} = '\\input texinfo   @c -*-texinfo-*-
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 9d9f85fe32..fc117dbd83 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -75,9 +75,6 @@ $result_trees{'weird_accents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,9 +152,6 @@ $result_trees{'weird_accents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -509,9 +503,7 @@ $result_trees{'weird_accents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'weird_accents'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'weird_accents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'weird_accents'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'weird_accents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'weird_accents'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'weird_accents'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'weird_accents'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'weird_accents'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'weird_accents'} = '@documentencoding ISO-8859-1
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 0b0c537293..2fd24e94d1 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -75,9 +75,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,9 +152,6 @@ $result_trees{'weird_accents_disable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -509,9 +503,7 @@ $result_trees{'weird_accents_disable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'weird_accents_disable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'weird_accents_disable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'weird_accents_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'weird_accents_disable_encoding'} = '@documentencoding ISO-8859-1
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 358c452054..3e3c22d2c6 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -244,9 +244,6 @@ $result_trees{'heading_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -309,9 +306,6 @@ $result_trees{'heading_in_copying'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -337,9 +331,7 @@ $result_trees{'heading_in_copying'} = {
   'type' => 'document_root'
 };
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'heading_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'heading_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'heading_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'heading_in_copying'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'heading_in_copying'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'heading_in_copying'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'heading_in_copying'} = '@copying
diff --git a/tp/t/results/html_tests/acronym_in_node_and_section.pl 
b/tp/t/results/html_tests/acronym_in_node_and_section.pl
index 4087c4d23e..6934388297 100644
--- a/tp/t/results/html_tests/acronym_in_node_and_section.pl
+++ b/tp/t/results/html_tests/acronym_in_node_and_section.pl
@@ -29,9 +29,6 @@ $result_trees{'acronym_in_node_and_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'acronym_in_node_and_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -189,9 +183,6 @@ $result_trees{'acronym_in_node_and_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -332,10 +323,6 @@ $result_trees{'acronym_in_node_and_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -446,14 +433,9 @@ $result_trees{'acronym_in_node_and_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'acronym_in_node_and_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'acronym_in_node_and_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'acronym_in_node_and_section'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'acronym_in_node_and_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'acronym_in_node_and_section'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'acronym_in_node_and_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'extra'}{'node_content'}[1]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'acronym_in_node_and_section'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index fbd06c939b..a408af1e38 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -85,9 +85,6 @@ $result_trees{'check_htmlxref'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -558,9 +555,6 @@ $result_trees{'check_htmlxref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -645,9 +639,6 @@ $result_trees{'check_htmlxref'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -716,7 +707,6 @@ $result_trees{'check_htmlxref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'contents'}[0];
@@ -726,10 +716,8 @@ 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'ex
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'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 369c8c37a3..0a4dad79a9 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
@@ -85,9 +85,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -558,9 +555,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -645,9 +639,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -716,7 +707,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[2]{'contents'}[0];
@@ -726,10 +716,8 @@ 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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 a7b8537733..63a9dfe31d 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -85,9 +85,6 @@ $result_trees{'check_htmlxref_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -558,9 +555,6 @@ $result_trees{'check_htmlxref_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -645,9 +639,6 @@ $result_trees{'check_htmlxref_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -716,7 +707,6 @@ $result_trees{'check_htmlxref_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[2]{'contents'}[0];
@@ -726,10 +716,8 @@ 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'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 a184356076..0a9b2f0f8e 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
@@ -85,9 +85,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -558,9 +555,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -645,9 +639,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -716,7 +707,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[2]{'contents'}[0];
@@ -726,10 +716,8 @@ 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'cont
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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 e0e0086eae..f7eb42083b 100644
--- a/tp/t/results/html_tests/contents_at_end.pl
+++ b/tp/t/results/html_tests/contents_at_end.pl
@@ -50,9 +50,6 @@ $result_trees{'contents_at_end'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_at_end'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -353,10 +347,8 @@ $result_trees{'contents_at_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'contents_at_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'contents_at_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'contents_at_end'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'contents_at_end'}{'contents'}[3]{'args'}[0]{'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 db18c89408..05779597ab 100644
--- a/tp/t/results/html_tests/contents_at_end_inline.pl
+++ b/tp/t/results/html_tests/contents_at_end_inline.pl
@@ -50,9 +50,6 @@ $result_trees{'contents_at_end_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_at_end_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -353,10 +347,8 @@ $result_trees{'contents_at_end_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[3]{'args'}[0]{'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 0c85c97e1f..3ed67711f6 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
@@ -50,9 +50,6 @@ $result_trees{'contents_at_end_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_at_end_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -353,10 +347,8 @@ $result_trees{'contents_at_end_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[3]{'args'}[0]{'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 e8849159be..1087fedf05 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter.pl
@@ -50,9 +50,6 @@ $result_trees{'contents_in_middle_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_in_middle_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -465,9 +459,6 @@ $result_trees{'contents_in_middle_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -553,13 +544,10 @@ $result_trees{'contents_in_middle_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[5]{'args'}[0]{'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 a4d7a9fae6..68f304c067 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
@@ -50,9 +50,6 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -465,9 +459,6 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -553,13 +544,10 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[5]{'args'}[0]{'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 eb54403fb6..c03161e836 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
@@ -50,9 +50,6 @@ $result_trees{'contents_in_middle_chapter_separate_element'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -465,9 +459,6 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -553,13 +544,10 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[5]{'args'}[0]{'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 e0d58f1a61..9b58fa764c 100644
--- a/tp/t/results/html_tests/contents_in_middle_section.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section.pl
@@ -50,9 +50,6 @@ $result_trees{'contents_in_middle_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_in_middle_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -489,9 +483,6 @@ $result_trees{'contents_in_middle_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -598,9 +589,6 @@ $result_trees{'contents_in_middle_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -686,16 +674,12 @@ $result_trees{'contents_in_middle_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'contents_in_middle_section'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[7]{'args'}[0]{'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 be7734466a..57ed1edeba 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
@@ -50,9 +50,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -489,9 +483,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -598,9 +589,6 @@ $result_trees{'contents_in_middle_section_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -686,16 +674,12 @@ $result_trees{'contents_in_middle_section_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[7]{'args'}[0]{'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 0ebf13f0e5..e763dffd2d 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
@@ -50,9 +50,6 @@ $result_trees{'contents_in_middle_section_separate_element'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -489,9 +483,6 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -598,9 +589,6 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -686,16 +674,12 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index c5ab024c2a..8df9210673 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -317,9 +317,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -397,9 +394,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -620,9 +614,7 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 4f60c2656c..85364398f1 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -282,9 +282,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -362,9 +359,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -585,9 +579,7 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/html_tests/double_contents.pl 
b/tp/t/results/html_tests/double_contents.pl
index 5016b17d4b..f64afe7984 100644
--- a/tp/t/results/html_tests/double_contents.pl
+++ b/tp/t/results/html_tests/double_contents.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'double_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'double_contents'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_contents'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'double_contents'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_contents'}{'contents'}[5]{'args'}[0]{'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 4a91c08a94..0a410f63c9 100644
--- a/tp/t/results/html_tests/double_contents_after_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_after_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_after_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_after_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_after_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[5]{'args'}[0]{'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 1b899fe8b7..20f5982ecf 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
@@ -71,9 +71,6 @@ $result_trees{'double_contents_after_title_show_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_after_title_show_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_after_title_show_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title_show_title'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[5]{'args'}[0]{'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 ef19efd176..f06e95e57f 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
@@ -71,9 +71,6 @@ $result_trees{'double_contents_after_title_show_title_nodes'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[5]{'args'}[0]{'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 4f1b7c6673..b01167f204 100644
--- a/tp/t/results/html_tests/double_contents_book.pl
+++ b/tp/t/results/html_tests/double_contents_book.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_book'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_book'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_book'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_book'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_book'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_book'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_book'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_book'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[5]{'args'}[0]{'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 a24b4ca767..e07dc7e0c2 100644
--- a/tp/t/results/html_tests/double_contents_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_chapter.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[5]{'args'}[0]{'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 5a6e9991bd..ab6b47dec7 100644
--- a/tp/t/results/html_tests/double_contents_inline.pl
+++ b/tp/t/results/html_tests/double_contents_inline.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[5]{'args'}[0]{'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 f8784aa4ce..f9de972fd7 100644
--- a/tp/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_inline_chapter.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_inline_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_inline_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_inline_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_inline_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[5]{'args'}[0]{'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 b1a5b8700b..18874964be 100644
--- a/tp/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_inline_nodes.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_inline_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_inline_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_inline_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_inline_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[5]{'args'}[0]{'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 8f531456f2..d6b3849ae3 100644
--- a/tp/t/results/html_tests/double_contents_inline_section.pl
+++ b/tp/t/results/html_tests/double_contents_inline_section.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_inline_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_inline_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_inline_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_inline_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_inline_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[5]{'args'}[0]{'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 aa452bf145..1f50f57ea3 100644
--- a/tp/t/results/html_tests/double_contents_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_nodes.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[5]{'args'}[0]{'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 36362342be..b6c694445c 100644
--- a/tp/t/results/html_tests/double_contents_section.pl
+++ b/tp/t/results/html_tests/double_contents_section.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[5]{'args'}[0]{'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 323287f228..6ee06a4f84 100644
--- a/tp/t/results/html_tests/double_contents_separate_element.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element.pl
@@ -71,9 +71,6 @@ $result_trees{'double_contents_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[5]{'args'}[0]{'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 70215277f1..1938c52350 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
@@ -71,9 +71,6 @@ $result_trees{'double_contents_separate_element_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[5]{'args'}[0]{'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 896317fb31..41e96ecfb0 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
@@ -71,9 +71,6 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[5]{'args'}[0]{'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 3955bfed48..49ddcb5084 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
@@ -71,9 +71,6 @@ $result_trees{'double_contents_separate_element_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -486,9 +480,6 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -575,13 +566,10 @@ $result_trees{'double_contents_separate_element_section'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_contents_separate_element_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_section'} = '\\input texinfo 
@c -*-texinfo-*-
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 3281011d87..7349fbcaf8 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -77,9 +77,6 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -151,7 +148,6 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_lines_at_beginning_no_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_lines_at_beginning_no_setfilename'} = '\\input texinfo
diff --git 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
index b4e91c040c..b63ce07283 100644
--- a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
+++ b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
@@ -29,9 +29,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +164,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'fOO'
           },
           'source_info' => {
@@ -223,9 +214,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -303,9 +291,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -383,9 +368,6 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -524,16 +506,10 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[9];
 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
index f28d949d1a..aafdf60224 100644
--- 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
+++ 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
@@ -29,9 +29,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +164,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'fOO'
           },
           'source_info' => {
@@ -223,9 +214,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -303,9 +291,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -383,9 +368,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -524,16 +506,10 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[9];
 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
index e489dc6c2f..7f053cd692 100644
--- 
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
+++ 
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
@@ -29,9 +29,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -200,9 +197,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'foo'
                       },
                       'source_info' => {
@@ -308,9 +302,6 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'Foo'
                       },
                       'source_info' => {
@@ -509,10 +500,7 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/html_tests/file_name_conflict_with_Top.pl 
b/tp/t/results/html_tests/file_name_conflict_with_Top.pl
index ec00f2d3b3..c551db1c08 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_Top.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_Top.pl
@@ -29,9 +29,6 @@ $result_trees{'file_name_conflict_with_Top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'file_name_conflict_with_Top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +164,6 @@ $result_trees{'file_name_conflict_with_Top'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'index'
           },
           'source_info' => {
@@ -202,11 +193,8 @@ $result_trees{'file_name_conflict_with_Top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_conflict_with_Top'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_conflict_with_Top'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_conflict_with_Top'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_Top'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'file_name_conflict_with_Top'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/file_name_conflict_with_section.pl 
b/tp/t/results/html_tests/file_name_conflict_with_section.pl
index 5fe8b304e1..0be2a8c4aa 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_section.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_section.pl
@@ -29,9 +29,6 @@ $result_trees{'file_name_conflict_with_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -85,9 +82,6 @@ $result_trees{'file_name_conflict_with_section'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'Chap'
           },
           'source_info' => {
@@ -151,9 +145,7 @@ $result_trees{'file_name_conflict_with_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_conflict_with_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_conflict_with_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_conflict_with_section'}{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_section'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'file_name_conflict_with_section'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl 
b/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
index b0eb73cac7..8ef7400ce6 100644
--- a/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
+++ b/tp/t/results/html_tests/file_name_conflict_with_user_defined.pl
@@ -29,9 +29,6 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +164,6 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'myanchor'
           },
           'source_info' => {
@@ -223,9 +214,6 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -280,12 +268,8 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'file_name_conflict_with_user_defined'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'file_name_conflict_with_user_defined'} = '@node Top
diff --git a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl 
b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
index 163f767505..7a76ba9421 100644
--- a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -29,9 +29,6 @@ $result_trees{'filenameconflictwithnonsplit'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -90,9 +87,6 @@ $result_trees{'filenameconflictwithnonsplit'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'filenameconflictwithnonsplit'
           },
           'source_info' => {
@@ -127,9 +121,7 @@ $result_trees{'filenameconflictwithnonsplit'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'filenameconflictwithnonsplit'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithnonsplit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'filenameconflictwithnonsplit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithnonsplit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'filenameconflictwithnonsplit'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithnonsplit'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'filenameconflictwithnonsplit'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index f343b67dc9..e211c8c76f 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -29,9 +29,6 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -146,9 +143,6 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -221,9 +215,6 @@ $result_trees{'filenameconflictwithspecialelement'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'filenameconflictwithspecialelement-fot'
           },
           'source_info' => {
@@ -258,11 +249,8 @@ $result_trees{'filenameconflictwithspecialelement'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'filenameconflictwithspecialelement'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'filenameconflictwithspecialelement'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'filenameconflictwithspecialelement'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'filenameconflictwithspecialelement'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'filenameconflictwithspecialelement'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index a83cd8e7f4..7a1e2ff8e1 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -175,9 +175,6 @@ $result_trees{'float_copying'} = {
                                               ],
                                               'cmdname' => 'anchor',
                                               'extra' => {
-                                                'node_content' => [
-                                                  {}
-                                                ],
                                                 'normalized' => 
'caption-copying-footnote-anchor'
                                               },
                                               'source_info' => {
@@ -320,9 +317,6 @@ $result_trees{'float_copying'} = {
                                                   'cmdname' => 'node',
                                                   'extra' => {
                                                     'isindex' => 1,
-                                                    'node_content' => [
-                                                      {}
-                                                    ],
                                                     'nodes_manuals' => [
                                                       {
                                                         'node_content' => [
@@ -414,9 +408,6 @@ $result_trees{'float_copying'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'public-domain-anchor'
                               },
                               'source_info' => {
@@ -563,9 +554,6 @@ $result_trees{'float_copying'} = {
                   'extra' => {
                     'caption' => {},
                     'float_type' => 'Copyright notice',
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'public-domain'
                   },
                   'info' => {
@@ -648,9 +636,6 @@ $result_trees{'float_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1371,19 +1356,14 @@ $result_trees{'float_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'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'}{'extra'}{'node_content'}[0]
 = 
$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'}{'args'}[0]{'contents'}[0];
 
$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'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$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'}{'args'}[0]{'contents'}[0];
 
$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'}{'node_argument'}{'node_content'}[0]
 = 
$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]{'args'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'float_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'float_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[1];
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl 
b/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
index 0376bc2b00..5f06fcb092 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
@@ -70,9 +70,6 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -185,9 +182,6 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -249,9 +243,7 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnotestyle_separate_html_text_no_monolithic'} = 
'@footnotestyle separate
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index b6c6e7c130..8314fd19e3 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -30,9 +30,6 @@ $result_trees{'footnotestyle_separate_late'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -118,9 +115,6 @@ $result_trees{'footnotestyle_separate_late'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -243,9 +237,6 @@ $result_trees{'footnotestyle_separate_late'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -382,13 +373,10 @@ $result_trees{'footnotestyle_separate_late'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[0]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1];
-$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
-$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
 
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 9a94f3febd..a8476246d2 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -170,9 +170,6 @@ $result_trees{'html_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -234,7 +231,6 @@ $result_trees{'html_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'html_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'html_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'html_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'html_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'html_in_copying'} = '
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 6830c2dc55..27c85b0fcd 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -144,9 +144,6 @@ $result_trees{'index_and_node_same_name'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -173,7 +170,6 @@ $result_trees{'index_and_node_same_name'} = {
 };
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_and_node_same_name'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_and_node_same_name'} = '@top top
diff --git a/tp/t/results/html_tests/no_content.pl 
b/tp/t/results/html_tests/no_content.pl
index 1aad7cf1e3..ea62dc9686 100644
--- a/tp/t/results/html_tests/no_content.pl
+++ b/tp/t/results/html_tests/no_content.pl
@@ -50,9 +50,6 @@ $result_trees{'no_content'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'no_content'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,10 +332,8 @@ $result_trees{'no_content'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_content'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'no_content'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content'}{'contents'}[3]{'args'}[0]{'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 dbdc13efac..31f305af2b 100644
--- a/tp/t/results/html_tests/no_content_do_contents.pl
+++ b/tp/t/results/html_tests/no_content_do_contents.pl
@@ -50,9 +50,6 @@ $result_trees{'no_content_do_contents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'no_content_do_contents'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,10 +332,8 @@ $result_trees{'no_content_do_contents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_do_contents'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_do_contents'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[3]{'args'}[0]{'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 67d221c4b5..17658b3b33 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
@@ -50,9 +50,6 @@ $result_trees{'no_content_do_contents_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'no_content_do_contents_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,10 +332,8 @@ $result_trees{'no_content_do_contents_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[3]{'args'}[0]{'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 f24587b206..4b551c49a8 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
@@ -50,9 +50,6 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,10 +332,8 @@ $result_trees{'no_content_do_contents_separate_element'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[3]{'args'}[0]{'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 f34350f301..0b25265910 100644
--- a/tp/t/results/html_tests/no_content_inline.pl
+++ b/tp/t/results/html_tests/no_content_inline.pl
@@ -50,9 +50,6 @@ $result_trees{'no_content_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'no_content_inline'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,10 +332,8 @@ $result_trees{'no_content_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_inline'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'no_content_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_inline'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content_inline'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'no_content_inline'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_inline'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_content_inline'}{'contents'}[3]{'args'}[0]{'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 d469f39ba1..817d87f37e 100644
--- a/tp/t/results/html_tests/no_content_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_separate_element.pl
@@ -50,9 +50,6 @@ $result_trees{'no_content_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,9 +247,6 @@ $result_trees{'no_content_separate_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,10 +332,8 @@ $result_trees{'no_content_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_separate_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_separate_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_content_separate_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[3]{'args'}[0]{'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 14bb93a8bb..609c6c7317 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -374,9 +374,6 @@ $result_trees{'node_footnote_end'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -522,9 +519,6 @@ $result_trees{'node_footnote_end'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -670,9 +664,6 @@ $result_trees{'node_footnote_end'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -713,9 +704,6 @@ $result_trees{'node_footnote_end'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1019,9 +1007,6 @@ $result_trees{'node_footnote_end'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1060,16 +1045,11 @@ 
$result_trees{'node_footnote_end'}{'contents'}[1]{'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'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'node_footnote_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_footnote_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'node_footnote_end'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_footnote_end'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'node_footnote_end'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_footnote_end'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[4]{'extra'}{'node_content'}[0] 
= $result_trees{'node_footnote_end'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_footnote_end'}{'contents'}[4]{'args'}[0]{'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'}[6]{'extra'}{'node_content'}[0] 
= $result_trees{'node_footnote_end'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_footnote_end'}{'contents'}[6]{'args'}[0]{'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 f2bc2685e7..8c71028c10 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -374,9 +374,6 @@ $result_trees{'node_footnote_separated'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -522,9 +519,6 @@ $result_trees{'node_footnote_separated'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -670,9 +664,6 @@ $result_trees{'node_footnote_separated'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -713,9 +704,6 @@ $result_trees{'node_footnote_separated'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1019,9 +1007,6 @@ $result_trees{'node_footnote_separated'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1060,16 +1045,11 @@ 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents
 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[4]{'args'}[0]{'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'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[6]{'args'}[0]{'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 fce2addc32..e78011cd0f 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -374,9 +374,6 @@ $result_trees{'node_footnote_use_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -522,9 +519,6 @@ $result_trees{'node_footnote_use_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -670,9 +664,6 @@ $result_trees{'node_footnote_use_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -713,9 +704,6 @@ $result_trees{'node_footnote_use_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1019,9 +1007,6 @@ $result_trees{'node_footnote_use_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1060,16 +1045,11 @@ 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'
 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[4]{'args'}[0]{'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'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[6]{'args'}[0]{'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 7ad43dddd6..3d4bf21cb1 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
@@ -374,9 +374,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -522,9 +519,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -670,9 +664,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -713,9 +704,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1019,9 +1007,6 @@ $result_trees{'node_footnote_use_node_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1060,16 +1045,11 @@ 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'
 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[4]{'args'}[0]{'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'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[6]{'args'}[0]{'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 117b72db7c..bfce233ab5 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -30,9 +30,6 @@ $result_trees{'redirection_same_labels'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -330,9 +327,6 @@ $result_trees{'redirection_same_labels'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -631,9 +625,6 @@ $result_trees{'redirection_same_labels'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -711,9 +702,6 @@ $result_trees{'redirection_same_labels'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -762,9 +750,6 @@ $result_trees{'redirection_same_labels'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -978,9 +963,6 @@ $result_trees{'redirection_same_labels'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1009,24 +991,18 @@ $result_trees{'redirection_same_labels'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'redirection_same_labels'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2];
-$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'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'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
 
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 44a60fafc0..0ff5580ffe 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -195,9 +195,6 @@ $result_trees{'ref_in_preformatted'} = {
                       ],
                       'cmdname' => 'node',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'nodes_manuals' => [
                           {
                             'node_content' => [
@@ -286,9 +283,6 @@ $result_trees{'ref_in_preformatted'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -315,11 +309,9 @@ $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'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 $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 8e09843bf7..73a284e3b1 100644
--- a/tp/t/results/html_tests/sectioning_frames.pl
+++ b/tp/t/results/html_tests/sectioning_frames.pl
@@ -72,9 +72,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -632,9 +629,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -951,9 +945,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1281,9 +1272,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1361,9 +1349,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1441,9 +1426,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1521,9 +1503,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1601,9 +1580,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1787,9 +1763,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1872,9 +1845,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1987,9 +1957,6 @@ $result_trees{'sectioning_frames'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2078,9 +2045,6 @@ $result_trees{'sectioning_frames'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2185,9 +2149,6 @@ $result_trees{'sectioning_frames'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2325,9 +2286,6 @@ $result_trees{'sectioning_frames'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2385,7 +2343,6 @@ $result_trees{'sectioning_frames'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sectioning_frames'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[1]{'args'}[2]{'contents'}[1];
@@ -2394,44 +2351,31 @@ 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'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'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[9]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[11]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[13]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[15]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[15]{'args'}[0]{'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'}[17]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[19]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[21]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[21]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[21]{'args'}[3]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[22]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[22]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[22]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[1]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[22]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[22]{'args'}[3]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[24]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[24]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[24]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[26]{'extra'}{'node_content'}[0] 
= $result_trees{'sectioning_frames'}{'contents'}[26]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[26]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[26]{'args'}[0]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[26]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[26]{'args'}[2]{'contents'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[26]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'sectioning_frames'}{'contents'}[26]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index b398b6b0b3..51d4a10aa3 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -112,9 +112,6 @@ $result_trees{'shorttitlepage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -244,7 +241,6 @@ $result_trees{'shorttitlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'shorttitlepage'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'shorttitlepage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'shorttitlepage'} = '
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index dd37007ce3..1c28ff423d 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -36,9 +36,6 @@ $result_trees{'simple_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1476,7 +1473,6 @@ $result_trees{'simple_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'simple_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'simple_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
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 b7244157cd..c8230faff2 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -482,9 +482,6 @@ $result_trees{'simple_menu_in_example'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -514,7 +511,6 @@ 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'simple_menu_in_example'} = '@node Top
diff --git a/tp/t/results/html_tests/simplest_test_date_in_header.pl 
b/tp/t/results/html_tests/simplest_test_date_in_header.pl
index 1267f0a1f0..c3d1447255 100644
--- a/tp/t/results/html_tests/simplest_test_date_in_header.pl
+++ b/tp/t/results/html_tests/simplest_test_date_in_header.pl
@@ -77,9 +77,6 @@ $result_trees{'simplest_test_date_in_header'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -114,7 +111,6 @@ $result_trees{'simplest_test_date_in_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simplest_test_date_in_header'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simplest_test_date_in_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simplest_test_date_in_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simplest_test_date_in_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'simplest_test_date_in_header'} = '\\input texinfo @c 
-*-texinfo-*-
diff --git a/tp/t/results/html_tests/split_html_text.pl 
b/tp/t/results/html_tests/split_html_text.pl
index a5193b70d8..0e8c29f2f7 100644
--- a/tp/t/results/html_tests/split_html_text.pl
+++ b/tp/t/results/html_tests/split_html_text.pl
@@ -30,9 +30,6 @@ $result_trees{'split_html_text'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -127,9 +124,6 @@ $result_trees{'split_html_text'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -188,10 +182,8 @@ $result_trees{'split_html_text'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'split_html_text'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'split_html_text'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_html_text'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'split_html_text'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'split_html_text'}[0]{'extra'}{'unit_command'} = 
$result_trees{'split_html_text'}[0]{'contents'}[1];
-$result_trees{'split_html_text'}[1]{'contents'}[0]{'extra'}{'node_content'}[0] 
= $result_trees{'split_html_text'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_html_text'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'split_html_text'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'split_html_text'}[1]{'extra'}{'unit_command'} = 
$result_trees{'split_html_text'}[1]{'contents'}[0];
 
diff --git a/tp/t/results/html_tests/test_accents_sc_default.pl 
b/tp/t/results/html_tests/test_accents_sc_default.pl
index 2780146189..d73d29181f 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -50,9 +50,6 @@ $result_trees{'test_accents_sc_default'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'test_accents_sc_default'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1153,9 +1147,7 @@ $result_trees{'test_accents_sc_default'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_default'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_default'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_default'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
index 88d8804adf..04e601b7e9 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ $result_trees{'test_accents_sc_default_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_default_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_default_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_default_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_default_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_default_latin1'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
index 01335c43d8..0cd75fbc81 100644
--- a/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default_usascii.pl
@@ -90,9 +90,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ $result_trees{'test_accents_sc_default_usascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_default_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_default_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_default_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_default_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_default_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_default_usascii'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
index 4d40fdff01..c5007a348a 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding.pl
@@ -50,9 +50,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1153,9 +1147,7 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_enable_encoding'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index 8f7b6d6467..14e98931d2 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_enable_encoding_latin1'} = '\\input texinfo
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
index 59cf9c4d2c..f569faa224 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
@@ -90,9 +90,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_enable_encoding_to_utf8_latin1'} = '\\input 
texinfo
diff --git 
a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
index 2641f6b114..ea85ca0cf0 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
@@ -90,9 +90,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_enable_encoding_to_utf8_usascii'} = '\\input 
texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index 284f0cafc8..61e242bce3 100644
--- a/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
+++ b/tp/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
@@ -90,9 +90,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_enable_encoding_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_enable_encoding_usascii'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index 6cbf861348..c5c82781e5 100644
--- a/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
+++ b/tp/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_to_utf8_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_to_utf8_latin1'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl 
b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
index eba0d42760..5ecf22fb11 100644
--- a/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
+++ b/tp/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
@@ -50,9 +50,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1153,9 +1147,7 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_accents_sc_use_numeric_entity'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_accents_sc_use_numeric_entity'} = '\\input texinfo
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 127f11a66a..842d75097b 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -29,9 +29,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -215,9 +212,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -434,10 +428,8 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[3]{'args'}[0]{'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];
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 cbb46ca289..6ea58a01e9 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -75,9 +75,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -261,9 +258,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -441,10 +435,8 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[3]{'args'}[0]{'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];
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 3e51b9210e..2776fa31ed 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -50,9 +50,6 @@ $result_trees{'text_before_top_and_contents_after_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -184,7 +181,6 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_top_and_contents_after_title'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'text_before_top_and_contents_after_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'text_before_top_and_contents_after_title'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'text_before_top_and_contents_after_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'text_before_top_and_contents_after_title'} = '
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 854c71aa4c..0a3ba74b89 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -50,9 +50,6 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -184,7 +181,6 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_top_and_summarycontents_after_title'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'text_before_top_and_summarycontents_after_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'text_before_top_and_summarycontents_after_title'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'text_before_top_and_summarycontents_after_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'text_before_top_and_summarycontents_after_title'} = '
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 45699c5dea..36b01699f6 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -112,9 +112,6 @@ $result_trees{'titles'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -244,7 +241,6 @@ $result_trees{'titles'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'titles'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'titles'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titles'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'titles'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titles'} = '
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 8092622056..4f68d210d9 100644
--- a/tp/t/results/html_tests/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit.pl
@@ -84,9 +84,6 @@ $result_trees{'top_node_up_explicit'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -299,9 +296,6 @@ $result_trees{'top_node_up_explicit'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -372,13 +366,11 @@ $result_trees{'top_node_up_explicit'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_up_explicit'} = '@node Top, (dir), (weird), (dir)
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 f6008712a0..54d9ca5265 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
@@ -84,9 +84,6 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -299,9 +296,6 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -372,13 +366,11 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_up_explicit_no_nodes'} = '@node Top, (dir), (weird), 
(dir)
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 5d46a15d6a..423cedff4c 100644
--- a/tp/t/results/html_tests/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit.pl
@@ -29,9 +29,6 @@ $result_trees{'top_node_up_implicit'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -229,9 +226,6 @@ $result_trees{'top_node_up_implicit'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,10 +296,8 @@ $result_trees{'top_node_up_implicit'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_implicit'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_implicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_up_implicit'} = '@node 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 62ade26700..15926bf6d2 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
@@ -29,9 +29,6 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -229,9 +226,6 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,10 +296,8 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_up_implicit_no_nodes'} = '@node Top
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl 
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index 9dfaf397dc..17a18dfcef 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -51,9 +51,6 @@ $result_trees{'transliterated_names_conflicts'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -139,9 +136,6 @@ $result_trees{'transliterated_names_conflicts'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -227,9 +221,6 @@ $result_trees{'transliterated_names_conflicts'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -288,9 +279,6 @@ $result_trees{'transliterated_names_conflicts'} = [
             ],
             'cmdname' => 'anchor',
             'extra' => {
-              'node_content' => [
-                {}
-              ],
               'normalized' => 'Pr_00eas'
             },
             'source_info' => {
@@ -384,9 +372,6 @@ $result_trees{'transliterated_names_conflicts'} = [
             'extra' => {
               'float_section' => {},
               'float_type' => 'Figure',
-              'node_content' => [
-                {}
-              ],
               'normalized' => 'Pr_00e8s'
             },
             'info' => {
@@ -435,17 +420,12 @@ $result_trees{'transliterated_names_conflicts'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'transliterated_names_conflicts'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_names_conflicts'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'transliterated_names_conflicts'}[0]{'extra'}{'unit_command'} = 
$result_trees{'transliterated_names_conflicts'}[0]{'contents'}[1];
-$result_trees{'transliterated_names_conflicts'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_names_conflicts'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'transliterated_names_conflicts'}[1]{'extra'}{'unit_command'} = 
$result_trees{'transliterated_names_conflicts'}[1]{'contents'}[0];
-$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'transliterated_names_conflicts'}[2]{'contents'}[1];
-$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
 $result_trees{'transliterated_names_conflicts'}[2]{'extra'}{'unit_command'} = 
$result_trees{'transliterated_names_conflicts'}[2]{'contents'}[0];
 
 $result_texis{'transliterated_names_conflicts'} = '\\input texinfo.tex
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 4a1c20c4b5..e04e0c47eb 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -50,9 +50,6 @@ $result_trees{'htmlxref'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1229,9 +1226,6 @@ $result_trees{'htmlxref'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1513,9 +1507,6 @@ $result_trees{'htmlxref'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1930,9 +1921,6 @@ $result_trees{'htmlxref'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -2123,9 +2111,6 @@ $result_trees{'htmlxref'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2620,7 +2605,6 @@ $result_trees{'htmlxref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'htmlxref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'htmlxref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2629,13 +2613,11 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'extra'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -2643,12 +2625,10 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref'}{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'htmlxref'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'htmlxref'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'htmlxref'}{'contents'}[3]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index a7ee4ce2b8..fa0348283b 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -50,9 +50,6 @@ $result_trees{'htmlxref_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1229,9 +1226,6 @@ $result_trees{'htmlxref_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1513,9 +1507,6 @@ $result_trees{'htmlxref_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1930,9 +1921,6 @@ $result_trees{'htmlxref_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -2123,9 +2111,6 @@ $result_trees{'htmlxref_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2620,7 +2605,6 @@ $result_trees{'htmlxref_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'htmlxref_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2629,13 +2613,11 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'e
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -2643,12 +2625,10 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'e
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 815e06a972..33f4b2b804 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -50,9 +50,6 @@ $result_trees{'htmlxref_only_mono'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1229,9 +1226,6 @@ $result_trees{'htmlxref_only_mono'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1513,9 +1507,6 @@ $result_trees{'htmlxref_only_mono'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1930,9 +1921,6 @@ $result_trees{'htmlxref_only_mono'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -2123,9 +2111,6 @@ $result_trees{'htmlxref_only_mono'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2620,7 +2605,6 @@ $result_trees{'htmlxref_only_mono'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_mono'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'htmlxref_only_mono'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2629,13 +2613,11 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -2643,12 +2625,10 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index c07d00e8d6..84b5b5cff0 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -50,9 +50,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1229,9 +1226,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1513,9 +1507,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1930,9 +1921,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -2123,9 +2111,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2620,7 +2605,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[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];
@@ -2629,13 +2613,11 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -2643,12 +2625,10 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index a9f7ed1bd2..ecb1739e48 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -50,9 +50,6 @@ $result_trees{'htmlxref_only_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1229,9 +1226,6 @@ $result_trees{'htmlxref_only_split'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1513,9 +1507,6 @@ $result_trees{'htmlxref_only_split'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1930,9 +1921,6 @@ $result_trees{'htmlxref_only_split'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -2123,9 +2111,6 @@ $result_trees{'htmlxref_only_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2620,7 +2605,6 @@ $result_trees{'htmlxref_only_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_split'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2629,13 +2613,11 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -2643,12 +2625,10 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 08efdf2dcb..ddf179b6f4 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -50,9 +50,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1229,9 +1226,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1513,9 +1507,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1930,9 +1921,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -2123,9 +2111,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2620,7 +2605,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[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];
@@ -2629,13 +2613,11 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -2643,12 +2625,10 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/include/cpp_line_latin1.pl 
b/tp/t/results/include/cpp_line_latin1.pl
index b0982c9880..7244b55a49 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'cpp_line_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -200,9 +197,6 @@ $result_trees{'cpp_line_latin1'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -237,9 +231,7 @@ $result_trees{'cpp_line_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cpp_line_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'cpp_line_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cpp_line_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cpp_line_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cpp_line_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'cpp_line_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'cpp_line_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cpp_line_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cpp_line_latin1'} = '\\input texinfo
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index 0cf3b26278..19961b5595 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -125,9 +125,6 @@ $result_trees{'cpp_lines'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1190,9 +1187,6 @@ $result_trees{'cpp_lines'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1227,9 +1221,7 @@ $result_trees{'cpp_lines'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'cpp_lines'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'cpp_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'cpp_lines'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'cpp_lines'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'cpp_lines'} = '\\input texinfo
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 5ea96d483b..2b5e332caa 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -357,9 +357,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -715,9 +712,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -742,9 +736,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'macro_and_commands_in_early_commands'} = '@macro begin-file
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 3711b7123b..1abfdf3f2e 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -522,9 +522,6 @@ $result_trees{'macro_in_early_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -892,9 +889,6 @@ $result_trees{'macro_in_early_commands'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -919,9 +913,7 @@ $result_trees{'macro_in_early_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_early_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'macro_in_early_commands'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_early_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'macro_in_early_commands'} = '@macro begin-file
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index 5f1b78bece..a9cfe9e935 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -152,9 +152,6 @@ $result_trees{'value_expansion_in_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -740,9 +737,6 @@ $result_trees{'value_expansion_in_include'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -767,9 +761,7 @@ $result_trees{'value_expansion_in_include'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_expansion_in_include'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_expansion_in_include'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'value_expansion_in_include'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_expansion_in_include'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_expansion_in_include'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_expansion_in_include'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'value_expansion_in_include'} = '@set testvar incl-incl.txi
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index c8e51e3260..7b05a95255 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -29,9 +29,6 @@ $result_trees{'complex_recursive_synindex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -942,9 +939,6 @@ $result_trees{'complex_recursive_synindex'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -969,7 +963,6 @@ $result_trees{'complex_recursive_synindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[12];
@@ -983,7 +976,6 @@ 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20]{'extr
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[21];
-$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'complex_recursive_synindex'} = '@node Top
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 6191800fb1..a371db7351 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -76,9 +76,6 @@ $result_trees{'def_syn_indices'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -157,9 +154,6 @@ $result_trees{'def_syn_indices'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1345,9 +1339,7 @@ $result_trees{'def_syn_indices'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'def_syn_indices'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'def_syn_indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'def_syn_indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'def_syn_indices'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'def_syn_indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'def_syn_indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3];
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index a022327ed9..8510e04127 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -35,9 +35,6 @@ $result_trees{'default_cp_index_and_one_letter_syncodeindex'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -243,9 +240,6 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -270,13 +264,11 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'contents'}[4];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'default_cp_index_and_one_letter_syncodeindex'} = '@node Top
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index b0f313e1f0..39b20dffb3 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -250,9 +250,6 @@ $result_trees{'double_index_entry'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -393,9 +390,6 @@ $result_trees{'double_index_entry'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -433,11 +427,9 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'inde
 
$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]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'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];
-$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 5f9ef746cd..dd6f286aaf 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -35,9 +35,6 @@ $result_trees{'double_seeentry_seealso'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +113,6 @@ $result_trees{'double_seeentry_seealso'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -582,9 +576,7 @@ $result_trees{'double_seeentry_seealso'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index b8e2ad7933..56012b1833 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -111,9 +111,6 @@ $result_trees{'double_syncodeindex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -313,9 +310,6 @@ $result_trees{'double_syncodeindex'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -340,13 +334,11 @@ $result_trees{'double_syncodeindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2];
-$result_trees{'double_syncodeindex'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'double_syncodeindex'} = '@syncodeindex cp fn
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index f2822b5c33..b5aa2fc4c7 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -35,9 +35,6 @@ $result_trees{'empty_cindex_entry'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -102,9 +99,6 @@ $result_trees{'empty_cindex_entry'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -129,9 +123,7 @@ $result_trees{'empty_cindex_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_cindex_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'empty_cindex_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_cindex_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_cindex_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_cindex_entry'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'empty_cindex_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_cindex_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_cindex_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_cindex_entry'} = '@node Top
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 8a4fea4943..81e7f4fb44 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -42,9 +42,6 @@ $result_trees{'empty_index_entry'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -242,9 +239,6 @@ $result_trees{'empty_index_entry'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -269,11 +263,9 @@ $result_trees{'empty_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'empty_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_index_entry'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'empty_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_index_entry'} = '@node Top
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 46def321db..2ba2db9905 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -35,9 +35,6 @@ $result_trees{'empty_string_index_entry'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -601,9 +598,6 @@ $result_trees{'empty_string_index_entry'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -628,7 +622,6 @@ $result_trees{'empty_string_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1];
@@ -645,7 +638,6 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'content
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_string_index_entry'} = '@node Top
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 62e832745a..35925e03dd 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -122,9 +122,6 @@ $result_trees{'encoding_index_ascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2813,9 +2810,6 @@ $result_trees{'encoding_index_ascii'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2840,7 +2834,6 @@ $result_trees{'encoding_index_ascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_ascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[1];
@@ -2952,7 +2945,6 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54]{'extra'}{'e
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[55];
-$result_trees{'encoding_index_ascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_index_ascii'} = '
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index f54b4720a3..1c49572fb3 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -122,9 +122,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2813,9 +2810,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2840,7 +2834,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[1];
@@ -2952,7 +2945,6 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[54];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[55];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_index_ascii_enable_encoding'} = '
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 40d0f14a02..f1bbcfd92d 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -85,9 +85,6 @@ $result_trees{'encoding_index_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2747,9 +2744,6 @@ $result_trees{'encoding_index_latin1'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2784,7 +2778,6 @@ $result_trees{'encoding_index_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[1];
@@ -2896,7 +2889,6 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54]{'extra'}{'
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[55];
-$result_trees{'encoding_index_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_index_latin1'} = '
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index e2b0a84d6a..1354031113 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -85,9 +85,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2747,9 +2744,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2784,7 +2778,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[1];
@@ -2896,7 +2889,6 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[55];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_index_latin1_enable_encoding'} = '
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 7dfe4b5983..0ccd14cd0e 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -85,9 +85,6 @@ $result_trees{'encoding_index_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2747,9 +2744,6 @@ $result_trees{'encoding_index_utf8'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2784,7 +2778,6 @@ $result_trees{'encoding_index_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_utf8'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[1];
@@ -2896,7 +2889,6 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54]{'extra'}{'el
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[55];
-$result_trees{'encoding_index_utf8'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_index_utf8'} = '
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index 996dd978e3..32838a9119 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -85,9 +85,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2747,9 +2744,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2784,7 +2778,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[1];
@@ -2896,7 +2889,6 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[55];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_index_utf8_enable_encoding'} = '
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index b6f37f0c1b..a188750365 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -35,9 +35,6 @@ $result_trees{'explicit_sort_key'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -613,9 +610,6 @@ $result_trees{'explicit_sort_key'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -640,7 +634,6 @@ $result_trees{'explicit_sort_key'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'explicit_sort_key'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'explicit_sort_key'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'explicit_sort_key'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3];
@@ -650,7 +643,6 @@ 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'eleme
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'explicit_sort_key'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'explicit_sort_key'} = '@node Top
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index c03e469204..6f4ab28856 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -45,9 +45,6 @@ $result_trees{'ftable_vtable'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -681,9 +678,6 @@ $result_trees{'ftable_vtable'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -708,7 +702,6 @@ $result_trees{'ftable_vtable'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ftable_vtable'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -726,7 +719,6 @@ 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'con
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ftable_vtable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ftable_vtable'} = '
diff --git a/tp/t/results/indices/ignored_sort_char_empty_entries.pl 
b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
index 8bf562dab1..734019869c 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -64,9 +64,6 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -364,9 +361,6 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -391,7 +385,6 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[1];
@@ -401,7 +394,6 @@ 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3]{'
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[4];
-$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ignored_sort_char_empty_entries'} = '@set txiindexhyphenignore
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 47628813af..d1f61badc8 100644
Binary files a/tp/t/results/indices/image_lines_count.pl and 
b/tp/t/results/indices/image_lines_count.pl differ
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 1caa7bab50..1840cb9d9d 100644
Binary files a/tp/t/results/indices/image_text_lines_count.pl and 
b/tp/t/results/indices/image_text_lines_count.pl differ
diff --git a/tp/t/results/indices/index_and_node_same_name.pl 
b/tp/t/results/indices/index_and_node_same_name.pl
index 9bd846882b..730a25e27f 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -35,9 +35,6 @@ $result_trees{'index_and_node_same_name'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -174,9 +171,6 @@ $result_trees{'index_and_node_same_name'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -286,11 +280,9 @@ $result_trees{'index_and_node_same_name'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_and_node_same_name'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[1];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_and_node_same_name'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_and_node_same_name'} = '@node Top
diff --git a/tp/t/results/indices/index_entries_before_nodes.pl 
b/tp/t/results/indices/index_entries_before_nodes.pl
index a853848065..8c2fa99771 100644
--- a/tp/t/results/indices/index_entries_before_nodes.pl
+++ b/tp/t/results/indices/index_entries_before_nodes.pl
@@ -129,9 +129,6 @@ $result_trees{'index_entries_before_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -258,9 +255,6 @@ $result_trees{'index_entries_before_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -288,11 +282,9 @@ $result_trees{'index_entries_before_nodes'} = {
 
$result_trees{'index_entries_before_nodes'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[1];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[1]{'contents'}[1];
-$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[2];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_before_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_before_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entries_before_nodes'} = '@cindex before
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index e57f16be2b..cfceedbcda 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -45,9 +45,6 @@ $result_trees{'index_entries_locations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -370,9 +367,6 @@ $result_trees{'index_entries_locations'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -397,7 +391,6 @@ $result_trees{'index_entries_locations'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries_locations'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4];
@@ -407,7 +400,6 @@ 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10]{'extra'}
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[13];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_locations'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entries_locations'} = '
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 7ef80b2a54..e2a9055a13 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index c272b06b18..1de5c2a18f 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -196,9 +196,6 @@ $result_trees{'index_entry_before_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -323,9 +320,6 @@ $result_trees{'index_entry_before_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -440,9 +434,6 @@ $result_trees{'index_entry_before_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -482,15 +473,12 @@ $result_trees{'index_entry_before_node'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index c9f5c023aa..0145863ca4 100644
Binary files a/tp/t/results/indices/index_entry_in_footnote.pl and 
b/tp/t/results/indices/index_entry_in_footnote.pl differ
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 8c9c2a4949..970598e352 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
@@ -196,9 +196,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -398,9 +395,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -483,9 +477,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -512,15 +503,12 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'args'}[0]{'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];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entry_in_footnote_different_node_end'} = '@node Top
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections.pl
index 04735a80f9..7a5ba7f33c 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -35,9 +35,6 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -210,9 +207,6 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -308,11 +302,9 @@ $result_trees{'index_entry_in_footnote_sections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entry_in_footnote_sections'} = '@node Top
diff --git a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
index eee090be04..9f06e557bf 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections_separate.pl
@@ -35,9 +35,6 @@ $result_trees{'index_entry_in_footnote_sections_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -210,9 +207,6 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -308,11 +302,9 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entry_in_footnote_sections_separate'} = '@node Top
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 3b41088105..2628fb5932 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -231,9 +231,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -433,9 +430,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -518,9 +512,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -547,15 +538,12 @@ $result_trees{'index_entry_in_footnote_separate'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'args'}[0]{'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];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[7];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entry_in_footnote_separate'} = '@footnotestyle separate
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index c7f3ea71a5..57d1f1a1b3 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -334,9 +334,6 @@ $result_trees{'index_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -717,9 +714,6 @@ $result_trees{'index_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -983,9 +977,6 @@ $result_trees{'index_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1195,9 +1186,6 @@ $result_trees{'index_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1488,9 +1476,6 @@ $result_trees{'index_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1541,7 +1526,6 @@ $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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1];
@@ -1552,13 +1536,11 @@ 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
@@ -1567,7 +1549,6 @@ 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_nod
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3];
-$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
@@ -1577,7 +1558,6 @@ 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_nod
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5];
-$result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'index_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
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 a1760a4002..93102d1e15 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
@@ -334,9 +334,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -717,9 +714,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -983,9 +977,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1195,9 +1186,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1488,9 +1476,6 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1541,7 +1526,6 @@ $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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'args'}[0]{'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];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[1];
@@ -1552,13 +1536,11 @@ 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'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'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
@@ -1567,7 +1549,6 @@ 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2]
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[3];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
@@ -1577,7 +1558,6 @@ 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4]
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[4];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[5];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index bc4300459f..43196239e9 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -100,9 +100,6 @@ $result_trees{'index_special_region'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ $result_trees{'index_special_region'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ $result_trees{'index_special_region'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ $result_trees{'index_special_region'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ $result_trees{'index_special_region'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1335,9 +1320,6 @@ $result_trees{'index_special_region'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1764,14 +1746,9 @@ $result_trees{'index_special_region'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5];
@@ -1784,7 +1761,6 @@ 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[4]{'args'}[0]{'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];
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 89861d074e..071018d781 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -100,9 +100,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1336,9 +1321,6 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1766,14 +1748,9 @@ $result_trees{'index_special_region_no_insertcopying'} = 
{
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5];
@@ -1786,7 +1763,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[4]{'args'}[0]{'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];
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 eaad206fac..bd3d51a9e6 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
@@ -100,9 +100,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1336,9 +1321,6 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1766,14 +1748,9 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'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'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
@@ -1786,7 +1763,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'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];
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 b52146eeaa..1cd5009133 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
@@ -100,9 +100,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1336,9 +1321,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1766,14 +1748,9 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'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'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
@@ -1786,7 +1763,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'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];
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 b43d568f00..3bc671386c 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
@@ -100,9 +100,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1336,9 +1321,6 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1766,14 +1748,9 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'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'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5];
@@ -1786,7 +1763,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'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];
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 3244340f55..37f198b23b 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
@@ -100,9 +100,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1335,9 +1320,6 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1764,14 +1746,9 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'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'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
@@ -1784,7 +1761,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'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];
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 662eff453a..97d4ddebbf 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
@@ -100,9 +100,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1335,9 +1320,6 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1764,14 +1746,9 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5];
@@ -1784,7 +1761,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4]{'args'}[0]{'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];
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 320d827ecd..296817ba78 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
@@ -100,9 +100,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Copying-information'
                   },
                   'source_info' => {
@@ -150,9 +147,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Public-domain-reference'
                               },
                               'source_info' => {
@@ -402,9 +396,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Titlepage-anchor'
                   },
                   'source_info' => {
@@ -448,9 +439,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'Titlepage-footnote-anchor'
                               },
                               'source_info' => {
@@ -624,9 +612,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1335,9 +1320,6 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1764,14 +1746,9 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
   'type' => 'document_root'
 };
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'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'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5];
@@ -1784,7 +1761,6 @@ 
$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'}{'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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4]{'args'}[0]{'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];
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index 19e2fd874e..814714c131 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -51,9 +51,6 @@ $result_trees{'index_split'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -803,9 +800,6 @@ $result_trees{'index_split'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1347,9 +1341,6 @@ $result_trees{'index_split'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1717,9 +1708,6 @@ $result_trees{'index_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1812,9 +1800,6 @@ $result_trees{'index_split'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2033,9 +2018,6 @@ $result_trees{'index_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2128,9 +2110,6 @@ $result_trees{'index_split'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2370,9 +2349,6 @@ $result_trees{'index_split'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2667,9 +2643,6 @@ $result_trees{'index_split'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2783,9 +2756,6 @@ $result_trees{'index_split'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2834,9 +2804,6 @@ $result_trees{'index_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2922,7 +2889,6 @@ $result_trees{'index_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_split'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -2939,7 +2905,6 @@ 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_nod
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[11];
-$result_trees{'index_split'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[0];
@@ -2953,7 +2918,6 @@ 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra
 
$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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[5]{'args'}[0]{'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];
@@ -2961,23 +2925,18 @@ 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra
 
$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'}[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'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[7];
-$result_trees{'index_split'}{'contents'}[11]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[13]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[13];
 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[15];
 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[15]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[15]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'contents'}[0];
@@ -2987,15 +2946,12 @@ 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'element_no
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[6];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[10];
-$result_trees{'index_split'}{'contents'}[16]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[16]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[17];
 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[17]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[17]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[17]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[17]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[18]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[18]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split'}{'contents'}[18]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_split'}{'contents'}[18]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_split'} = '\\input texinfo @c -*-texinfo-*-
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 cb94d3ed7f..14c9ccf512 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
@@ -51,9 +51,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -803,9 +800,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1347,9 +1341,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1717,9 +1708,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1812,9 +1800,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2033,9 +2018,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2128,9 +2110,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2370,9 +2349,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2667,9 +2643,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2783,9 +2756,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2834,9 +2804,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2922,7 +2889,6 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -2939,7 +2905,6 @@ 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[5
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[5];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0];
@@ -2953,7 +2918,6 @@ 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4
 
$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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'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];
@@ -2961,23 +2925,18 @@ 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3
 
$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'}[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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$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];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[7];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[2]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[3]{'contents'}[0];
@@ -2987,15 +2946,12 @@ 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[10];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[3]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[1];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[18]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[18]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[18]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[18]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_split_split_chapter_no_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
diff --git a/tp/t/results/indices/index_table.pl 
b/tp/t/results/indices/index_table.pl
index c9a962cfec..ddc83a5277 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -50,9 +50,6 @@ $result_trees{'index_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -327,9 +324,6 @@ $result_trees{'index_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -948,9 +942,6 @@ $result_trees{'index_table'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1136,9 +1127,6 @@ $result_trees{'index_table'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6389,9 +6377,6 @@ $result_trees{'index_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6495,12 +6480,10 @@ $result_trees{'index_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_table'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[3]{'args'}[0]{'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];
@@ -6518,9 +6501,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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[7]{'args'}[0]{'contents'}[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'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
@@ -6779,7 +6760,6 @@ 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[127]{'extra'}{'element_n
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[127]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[127];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[128]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[128]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table'}{'contents'}[8]{'contents'}[128];
-$result_trees{'index_table'}{'contents'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'index_table'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'index_table'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_table'} = '\\input texinfo @c -*-texinfo-*-
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 2c6046bac6..4ceb889575 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -50,9 +50,6 @@ $result_trees{'index_table_chapter_no_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -327,9 +324,6 @@ $result_trees{'index_table_chapter_no_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -948,9 +942,6 @@ $result_trees{'index_table_chapter_no_node'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1136,9 +1127,6 @@ $result_trees{'index_table_chapter_no_node'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6389,9 +6377,6 @@ $result_trees{'index_table_chapter_no_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -6495,12 +6480,10 @@ $result_trees{'index_table_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_table_chapter_no_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[3]{'args'}[0]{'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];
@@ -6518,9 +6501,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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[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'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
@@ -6779,7 +6760,6 @@ 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127]{'ex
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[128];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_table_chapter_no_node'} = '\\input texinfo @c 
-*-texinfo-*-
diff --git 
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index b93f625651..f12d954209 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -35,9 +35,6 @@ $result_trees{'multiple_index_text_sortas_seeentry_seealso'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -106,9 +103,6 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -465,9 +459,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index 6a07e7084e..009073111d 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -303,9 +303,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -516,9 +513,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -867,9 +861,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1218,9 +1209,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1484,9 +1472,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1696,9 +1681,6 @@ $result_trees{'nodes_before_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1989,9 +1971,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2042,7 +2021,6 @@ $result_trees{'nodes_before_top'} = {
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -2050,13 +2028,11 @@ 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'elemen
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
@@ -2066,13 +2042,11 @@ 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
@@ -2081,7 +2055,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'elemen
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'contents'}[0];
@@ -2091,7 +2064,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'elemen
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'contents'}[0];
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 ea0e009848..80d3ea809f 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
@@ -333,9 +333,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -555,9 +552,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -804,9 +798,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1447,9 +1438,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1713,9 +1701,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1925,9 +1910,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2218,9 +2200,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2294,9 +2273,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2501,9 +2477,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2554,7 +2527,6 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -2562,12 +2534,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'
 
$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];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'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'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[2]{'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];
@@ -2582,13 +2552,11 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'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'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
@@ -2597,7 +2565,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
@@ -2607,17 +2574,14 @@ 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'args'}[3]{'contents'}[0];
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 02e68ab0bc..b34e762b1a 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
@@ -333,9 +333,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -555,9 +552,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -804,9 +798,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1447,9 +1438,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1713,9 +1701,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1925,9 +1910,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2218,9 +2200,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2294,9 +2273,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2501,9 +2477,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2554,7 +2527,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -2562,12 +2534,10 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'c
 
$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];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[6]{'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'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[6];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'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'}[3]{'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'}[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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'args'}[2]{'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];
@@ -2582,13 +2552,11 @@ 
$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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'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'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
@@ -2597,7 +2565,6 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'c
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[3]{'contents'}[0];
@@ -2607,17 +2574,14 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'c
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'args'}[3]{'contents'}[0];
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 817d7dcd79..990fdd1975 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
@@ -333,9 +333,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -555,9 +552,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -804,9 +798,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1447,9 +1438,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1713,9 +1701,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1925,9 +1910,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2218,9 +2200,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2294,9 +2273,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2501,9 +2477,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2554,7 +2527,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -2562,12 +2534,10 @@ 
$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];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[6]{'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'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[6];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'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'}[3]{'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'}[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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'args'}[2]{'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];
@@ -2582,13 +2552,11 @@ 
$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'}{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[3]{'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'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
@@ -2597,7 +2565,6 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
@@ -2607,17 +2574,14 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'args'}[3]{'contents'}[0];
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 d55d8908e0..8592a8cc2f 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -303,9 +303,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -516,9 +513,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -867,9 +861,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1218,9 +1209,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1484,9 +1472,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1696,9 +1681,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1989,9 +1971,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2042,7 +2021,6 @@ $result_trees{'nodes_before_top_split_chapter'} = {
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -2050,13 +2028,11 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'e
 
$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];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'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];
@@ -2066,13 +2042,11 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[2]{'e
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'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];
@@ -2081,7 +2055,6 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2]{'e
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
@@ -2091,7 +2064,6 @@ 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4]{'e
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
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 ed8f91b7e1..1744239925 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
@@ -303,9 +303,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -516,9 +513,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -867,9 +861,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1218,9 +1209,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1484,9 +1472,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1696,9 +1681,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1989,9 +1971,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2042,7 +2021,6 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
@@ -2050,13 +2028,11 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'content
 
$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];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[5]{'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'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'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'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4];
@@ -2066,13 +2042,11 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'content
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'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'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
@@ -2081,7 +2055,6 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'content
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
@@ -2091,7 +2064,6 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'content
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[4];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index 2d3ae03491..8bb38fb4ce 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -66,9 +66,6 @@ $result_trees{'print_merged_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -140,9 +137,6 @@ $result_trees{'print_merged_index'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -167,9 +161,7 @@ $result_trees{'print_merged_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'print_merged_index'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'print_merged_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'print_merged_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'print_merged_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'print_merged_index'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'print_merged_index'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'print_merged_index'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'print_merged_index'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'print_merged_index'} = '@syncodeindex fn cp
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index 1e7fd0356a..2a93e9f359 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -35,9 +35,6 @@ $result_trees{'printindex_between_node_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -276,9 +273,6 @@ $result_trees{'printindex_between_node_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -476,9 +470,6 @@ $result_trees{'printindex_between_node_section'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -533,7 +524,6 @@ $result_trees{'printindex_between_node_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_between_node_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[1];
@@ -543,13 +533,11 @@ 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[4];
-$result_trees{'printindex_between_node_section'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[4]{'contents'}[2];
-$result_trees{'printindex_between_node_section'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_node_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'printindex_between_node_section'} = '@node Top
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index 8e7c67a7e4..ab156569b3 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -36,9 +36,6 @@ $result_trees{'printindex_between_part_chapter'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -353,9 +350,6 @@ $result_trees{'printindex_between_part_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -435,9 +429,6 @@ $result_trees{'printindex_between_part_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -582,7 +573,6 @@ $result_trees{'printindex_between_part_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[1];
@@ -592,10 +582,8 @@ 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[4];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[5]{'extra'}{'associated_part'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[3];
-$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[1];
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 2f3fae4156..fabd261d0e 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -565,9 +565,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -781,9 +778,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -916,10 +910,8 @@ 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[1]{'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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[3]{'args'}[0]{'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 9b10fcb633..38a2d43481 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
@@ -229,9 +229,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -444,9 +441,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -529,10 +523,8 @@ 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[3]{'args'}[0]{'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 38f31557ef..dbbb2a2b1f 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
@@ -565,9 +565,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -766,9 +763,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -886,10 +880,8 @@ 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[1]{'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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying_no_insertcopying'} = '@copying
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index ffd8a43fdf..4a05cecfef 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 9ce42d5376..bbeadae783 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -76,9 +76,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -147,9 +144,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -536,9 +530,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index 6ab9513b86..4c5c6e0bb8 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -35,9 +35,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +113,6 @@ $result_trees{'same_only_seealso_seeentry'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -601,9 +595,7 @@ $result_trees{'same_only_seealso_seeentry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 88d1b2fd10..bd5cad23e2 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -35,9 +35,6 @@ $result_trees{'same_seealso_seeentry'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +113,6 @@ $result_trees{'same_seealso_seeentry'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -645,9 +639,7 @@ $result_trees{'same_seealso_seeentry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 8ce4e00dac..939dc791ec 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -35,9 +35,6 @@ $result_trees{'seealso_duplicate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,9 +335,6 @@ $result_trees{'seealso_duplicate'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -365,7 +359,6 @@ $result_trees{'seealso_duplicate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'seealso_duplicate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1];
@@ -374,7 +367,6 @@ 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'eleme
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'seealso'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2];
 $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'seealso_duplicate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'seealso_duplicate'} = '@node Top
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index cb9b2dd285..baabae844b 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -35,9 +35,6 @@ $result_trees{'seeentry'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -106,9 +103,6 @@ $result_trees{'seeentry'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -496,9 +490,7 @@ $result_trees{'seeentry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'seeentry'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'seeentry'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'seeentry'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'seeentry'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index 3626505178..b5be5e11a2 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -35,9 +35,6 @@ $result_trees{'sorted_subentries'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -105,9 +102,6 @@ $result_trees{'sorted_subentries'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1000,9 +994,6 @@ $result_trees{'sorted_subentries'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1868,9 +1859,7 @@ $result_trees{'sorted_subentries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sorted_subentries'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'sorted_subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'sorted_subentries'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'sorted_subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1];
@@ -1906,7 +1895,6 @@ 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'inde
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[23] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'};
 $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[24] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'sorted_subentries'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sorted_subentries'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0];
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index c13d9be664..973101749b 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -93,9 +93,6 @@ $result_trees{'split_chapter_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -338,9 +335,6 @@ $result_trees{'split_chapter_index'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -899,9 +893,6 @@ $result_trees{'split_chapter_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1173,9 +1164,6 @@ $result_trees{'split_chapter_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1305,12 +1293,10 @@ $result_trees{'split_chapter_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_chapter_index'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[3]{'args'}[0]{'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];
@@ -1329,14 +1315,12 @@ 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'extra'}{'in
 
$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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[5]{'args'}[0]{'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'}[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];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5];
-$result_trees{'split_chapter_index'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[7];
 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3];
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 320844961e..b0a05524a3 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -35,9 +35,6 @@ $result_trees{'subentries'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -106,9 +103,6 @@ $result_trees{'subentries'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -944,9 +938,7 @@ $result_trees{'subentries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'subentries'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'subentries'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentries'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'subentries'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index ef011729d6..205ef633f3 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -35,9 +35,6 @@ $result_trees{'subentry_and_sortas'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -106,9 +103,6 @@ $result_trees{'subentry_and_sortas'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -482,9 +476,7 @@ $result_trees{'subentry_and_sortas'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'subentry_and_sortas'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index a88fad40cf..4498131f15 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -35,9 +35,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -106,9 +103,6 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -614,9 +608,7 @@ $result_trees{'subentry_and_sortas_spaces'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 38fff64543..2083013798 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -76,9 +76,6 @@ $result_trees{'syncode_index_print_both'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -157,9 +154,6 @@ $result_trees{'syncode_index_print_both'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -415,9 +409,7 @@ $result_trees{'syncode_index_print_both'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'syncode_index_print_both'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'syncode_index_print_both'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index 4cb03e5f9d..2a3f4bdb76 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -76,9 +76,6 @@ $result_trees{'syncodeindex_to_plain'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -340,9 +337,6 @@ $result_trees{'syncodeindex_to_plain'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -367,7 +361,6 @@ $result_trees{'syncodeindex_to_plain'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[1];
@@ -375,7 +368,6 @@ 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2]{'extra'}{'e
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'contents'}[3];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'syncodeindex_to_plain'} = '@syncodeindex ky cp
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 96f0d4f91f..4cad2f56e1 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -64,9 +64,6 @@ $result_trees{'transparent_sort_chars'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -337,9 +334,6 @@ $result_trees{'transparent_sort_chars'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -364,7 +358,6 @@ $result_trees{'transparent_sort_chars'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'transparent_sort_chars'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1];
@@ -372,7 +365,6 @@ 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'transparent_sort_chars'} = '@set txiindexhyphenignore
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 33e543556c..694622a59c 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -36,9 +36,6 @@ $result_trees{'w_lines_count'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -264,7 +261,6 @@ $result_trees{'w_lines_count'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'w_lines_count'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'w_lines_count'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'w_lines_count'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'w_lines_count'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'w_lines_count'}{'contents'}[1];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3];
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index a39f2f87fe..1f21cb724b 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -29,9 +29,6 @@ $result_trees{'anchor_and_spaces'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -85,9 +82,6 @@ $result_trees{'anchor_and_spaces'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'anchor-0'
           },
           'source_info' => {
@@ -124,9 +118,6 @@ $result_trees{'anchor_and_spaces'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anchor1'
               },
               'source_info' => {
@@ -165,9 +156,6 @@ $result_trees{'anchor_and_spaces'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anchor2'
               },
               'source_info' => {
@@ -199,11 +187,7 @@ $result_trees{'anchor_and_spaces'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_and_spaces'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_and_spaces'} = '@node Top
 @top Element
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index f0042fd9b7..ca573ce65f 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -120,9 +120,6 @@ $result_trees{'anchor_in_command'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'anchor-in-emph'
                               },
                               'source_info' => {
@@ -162,9 +159,6 @@ $result_trees{'anchor_in_command'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -189,8 +183,6 @@ $result_trees{'anchor_in_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_command'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_command'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_command'} = '@node Top
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index 946f5be540..116d917a2b 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -50,9 +50,6 @@ $result_trees{'before_node_and_section'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -180,9 +177,6 @@ $result_trees{'before_node_and_section'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anchor1'
               },
               'source_info' => {
@@ -562,9 +556,6 @@ $result_trees{'before_node_and_section'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -665,17 +656,14 @@ $result_trees{'before_node_and_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$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'}[2]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$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'}[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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'before_node_and_section'} = 'Garbage
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index 7e4af731f2..3973a00a4c 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -131,9 +131,6 @@ $result_trees{'center_flush'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'anchor-in-flushleft'
                   },
                   'source_info' => {
@@ -286,9 +283,6 @@ $result_trees{'center_flush'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'anchor-in-flushright'
                   },
                   'source_info' => {
@@ -322,9 +316,6 @@ $result_trees{'center_flush'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'second-anchor-in-flushright'
                   },
                   'source_info' => {
@@ -389,9 +380,6 @@ $result_trees{'center_flush'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'center_flush'} = '@center centered
 
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index c193e524fe..c9d70793d0 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -555,9 +555,6 @@ $result_trees{'colon_in_index_entry'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -597,7 +594,6 @@ 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'colon_in_index_entry'} = '@node 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 4a20f711a5..6cab3a3ca7 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
@@ -231,9 +231,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -643,13 +640,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -741,9 +731,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -774,7 +761,6 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'args'}[0]{'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];
@@ -788,17 +774,11 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'colons_in_index_entries_and_node'} = '@node Top
diff --git 
a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
index ecafdadc6e..ee731f693e 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
@@ -231,9 +231,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -643,13 +640,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -741,9 +731,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -774,7 +761,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'con
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'args'}[0]{'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];
@@ -788,17 +774,11 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'con
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'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'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[3];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'colons_in_index_entries_and_node_no_quoting'} = '@node Top
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 456aad3c72..c5266866be 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -109,9 +109,6 @@ $result_trees{'def_in_copying'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -752,7 +749,6 @@ $result_trees{'def_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'def_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'def_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'def_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/info_tests/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
index cd647cc789..f0ea3e0fa4 100644
--- a/tp/t/results/info_tests/direntry_dircategory.pl
+++ b/tp/t/results/info_tests/direntry_dircategory.pl
@@ -455,9 +455,6 @@ $result_trees{'direntry_dircategory'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -802,9 +799,6 @@ $result_trees{'direntry_dircategory'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -893,11 +887,9 @@ $result_trees{'direntry_dircategory'} = {
 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'direntry_dircategory'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'direntry_dircategory'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[3]{'args'}[0]{'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 bc0a8f836d..4fdf4269b0 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -393,9 +393,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -469,7 +466,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'direntry_dircategory_and_commands'} = '@dircategory 
``category---@var{th  ere}?\'\'
diff --git a/tp/t/results/info_tests/empty_caption.pl 
b/tp/t/results/info_tests/empty_caption.pl
index 24467fd7cc..7eed8a3215 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -134,9 +134,6 @@ $result_trees{'empty_caption'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'a',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'b'
           },
           'info' => {
@@ -189,9 +186,6 @@ $result_trees{'empty_caption'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -218,8 +212,6 @@ $result_trees{'empty_caption'} = {
 };
 
$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'empty_caption'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'empty_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_caption'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_caption'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_caption'} = '
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index 2c11c5ec33..09ff6fa45a 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -82,9 +82,6 @@ $result_trees{'encoding_us_ascii'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,7 +106,6 @@ $result_trees{'encoding_us_ascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_us_ascii'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'encoding_us_ascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_us_ascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'encoding_us_ascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'encoding_us_ascii'} = '
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 ec0e13f47d..367613abeb 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
@@ -29,9 +29,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -122,13 +119,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -197,11 +187,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {},
-              {},
-              {}
-            ],
             'normalized' => 'ankh-p'
           },
           'source_info' => {
@@ -367,9 +352,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -918,24 +900,14 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'node_content'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[3];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 0b27be14f6..04f71381d3 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -253,9 +253,6 @@ $result_trees{'error_in_footnote'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label'
           },
           'info' => {
@@ -345,9 +342,6 @@ $result_trees{'error_in_footnote'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -374,8 +368,6 @@ $result_trees{'error_in_footnote'} = {
 };
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'error_in_footnote'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'error_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'error_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'error_in_footnote'} = '
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index c20564db78..037f4b0921 100644
Binary files a/tp/t/results/info_tests/file_only_png.pl and 
b/tp/t/results/info_tests/file_only_png.pl differ
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index ef3b076edf..bb94c57854 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -131,9 +131,6 @@ $result_trees{'float_long_captions'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'text1'
           },
           'info' => {
@@ -249,9 +246,6 @@ $result_trees{'float_long_captions'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'text2'
           },
           'info' => {
@@ -304,9 +298,6 @@ $result_trees{'float_long_captions'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -333,11 +324,8 @@ $result_trees{'float_long_captions'} = {
 };
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'float'}
 = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'float'}
 = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'float_long_captions'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'float_long_captions'} = '@node Top
diff --git a/tp/t/results/info_tests/float_without_type.pl 
b/tp/t/results/info_tests/float_without_type.pl
index f4ba681cda..fdae737f4d 100644
--- a/tp/t/results/info_tests/float_without_type.pl
+++ b/tp/t/results/info_tests/float_without_type.pl
@@ -158,9 +158,6 @@ $result_trees{'float_without_type'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -185,7 +182,6 @@ $result_trees{'float_without_type'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_without_type'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'float_without_type'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_without_type'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'float_without_type'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'float_without_type'} = '
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index 40638b2355..2342037407 100644
Binary files a/tp/t/results/info_tests/image_and_punctuation.pl and 
b/tp/t/results/info_tests/image_and_punctuation.pl differ
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl 
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 2e9458c6ef..76924d82e7 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -712,9 +712,6 @@ $result_trees{'image_and_spaces_formatting'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -739,7 +736,6 @@ $result_trees{'image_and_spaces_formatting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'image_and_spaces_formatting'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_and_spaces_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'image_and_spaces_formatting'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'image_and_spaces_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'image_and_spaces_formatting'} = '@node Top
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index 3d82402789..f7df52cd8b 100644
Binary files a/tp/t/results/info_tests/image_extension.pl and 
b/tp/t/results/info_tests/image_extension.pl differ
diff --git a/tp/t/results/info_tests/image_in_paragraph.pl 
b/tp/t/results/info_tests/image_in_paragraph.pl
index c2a0326a71..0791dcab4b 100644
Binary files a/tp/t/results/info_tests/image_in_paragraph.pl and 
b/tp/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tp/t/results/info_tests/image_not_found.pl 
b/tp/t/results/info_tests/image_not_found.pl
index 7151a05fa5..27bf9e1bfb 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -56,9 +56,6 @@ $result_trees{'image_not_found'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -83,7 +80,6 @@ $result_trees{'image_not_found'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'image_not_found'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'image_not_found'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'image_not_found'} = '@node Top
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index 685b9246c0..058fbb0117 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and 
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/image_text_file_only_and_alt.pl 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl
index ce31c7f929..785039252d 100644
Binary files a/tp/t/results/info_tests/image_text_file_only_and_alt.pl and 
b/tp/t/results/info_tests/image_text_file_only_and_alt.pl differ
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index f57ad8b59d..7fd1b45fee 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
@@ -29,9 +29,6 @@ $result_trees{'index_entry_at_end_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -268,9 +265,6 @@ $result_trees{'index_entry_at_end_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -403,9 +397,6 @@ $result_trees{'index_entry_at_end_node'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -501,15 +492,12 @@ $result_trees{'index_entry_at_end_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_at_end_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[3]{'args'}[0]{'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];
-$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'index_entry_at_end_node'} = '@node Top
diff --git a/tp/t/results/info_tests/invalid_node_name_no_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index 1e60d20240..cc105f4da9 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
@@ -320,9 +320,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -385,9 +382,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -451,11 +445,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -706,9 +695,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -739,13 +725,8 @@ 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'con
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[3]{'args'}[0]{'contents'}[2];
@@ -757,7 +738,6 @@ 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'con
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}
 = $result_trees{'invalid_node_name_no_warning'}{'contents'}[4];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'invalid_node_name_no_warning'} = '
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 78b4910237..8623d89722 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -320,9 +320,6 @@ $result_trees{'invalid_node_name_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -385,9 +382,6 @@ $result_trees{'invalid_node_name_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -451,11 +445,6 @@ $result_trees{'invalid_node_name_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -706,9 +695,6 @@ $result_trees{'invalid_node_name_warning'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -739,13 +725,8 @@ 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'conten
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[3]{'args'}[0]{'contents'}[2];
@@ -757,7 +738,6 @@ 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'conten
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}
 = $result_trees{'invalid_node_name_warning'}{'contents'}[4];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'invalid_node_name_warning'} = '
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index 154c3a42c4..11ebb8e976 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -82,9 +82,6 @@ $result_trees{'known_encoding'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,7 +106,6 @@ $result_trees{'known_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'known_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'known_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'known_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'known_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'known_encoding'} = '
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 864008e823..97761dc1c7 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -315,9 +315,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'anchor-in-multitable'
                           },
                           'source_info' => {
@@ -690,9 +687,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'mark'
                               },
                               'source_info' => {
@@ -917,9 +911,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -946,18 +937,15 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
 };
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'multitable_anchor_and_index_entry'} = '@node Top
diff --git a/tp/t/results/info_tests/nested_footnotes_separate.pl 
b/tp/t/results/info_tests/nested_footnotes_separate.pl
index 2d3fe17c5a..fda6840bb6 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -148,9 +148,6 @@ $result_trees{'nested_footnotes_separate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -175,7 +172,6 @@ $result_trees{'nested_footnotes_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nested_footnotes_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'nested_footnotes_separate'} = '@footnotestyle separate
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index 27d199dcbb..ee93667152 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -170,9 +170,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               ],
                                               'cmdname' => 'anchor',
                                               'extra' => {
-                                                'node_content' => [
-                                                  {}
-                                                ],
                                                 'normalized' => 'mark-inside'
                                               },
                                               'source_info' => {
@@ -406,9 +403,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'mark'
                               },
                               'source_info' => {
@@ -658,9 +652,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -685,12 +676,10 @@ $result_trees{'nested_multitable_anchor_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
@@ -699,7 +688,6 @@ 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'c
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'nested_multitable_anchor_index'} = '@node Top
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index c95d905395..4441893c4e 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -29,9 +29,6 @@ $result_trees{'no_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -56,7 +53,6 @@ $result_trees{'no_top_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_top_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_top_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'no_top_node'} = '@node node Top not Top node
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index b112d38592..8f7ccd42bc 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -251,9 +251,6 @@ $result_trees{'note_in_strong'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -278,7 +275,6 @@ $result_trees{'note_in_strong'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'note_in_strong'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'note_in_strong'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'note_in_strong'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'note_in_strong'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'note_in_strong'} = '@node Top
diff --git a/tp/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index 8c6024ea7c..6837acc366 100644
--- a/tp/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/tp/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -105,9 +105,6 @@ $result_trees{'note_in_strong_end_of_line'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -132,7 +129,6 @@ $result_trees{'note_in_strong_end_of_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'note_in_strong_end_of_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'note_in_strong_end_of_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'note_in_strong_end_of_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'note_in_strong_end_of_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'note_in_strong_end_of_line'} = '@node Top
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index 4d2bdcbcab..aa8c50fa44 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -148,9 +148,6 @@ $result_trees{'novalidate_empty_refs'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -304,7 +301,6 @@ $result_trees{'novalidate_empty_refs'} = {
 };
 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'novalidate_empty_refs'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'novalidate_empty_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
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 17c092eefb..731118b620 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -174,9 +174,6 @@ $result_trees{'one_node_counted_elements'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'ref'
               },
               'source_info' => {
@@ -408,9 +405,6 @@ $result_trees{'one_node_counted_elements'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -445,11 +439,9 @@ $result_trees{'one_node_counted_elements'} = {
 
$result_trees{'one_node_counted_elements'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[0]{'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'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[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];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 10a2a0fdfa..cfb1c577b2 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -170,9 +170,6 @@ $result_trees{'paragraphindent_and_preamble'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -288,7 +285,6 @@ $result_trees{'paragraphindent_and_preamble'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'paragraphindent_and_preamble'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'paragraphindent_and_preamble'} = '@copying
diff --git 
a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
index f42be9f772..d59867da71 100644
--- a/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
@@ -170,9 +170,6 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -341,7 +338,6 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'paragraphindent_in_preamble_and_in_document'} = '@copying
diff --git a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
index 6e8c8bd6b1..5ea5e97af3 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -117,9 +117,6 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -288,7 +285,6 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'paragraphindent_not_in_preamble'} = '@copying
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index 689d5f3c7c..d32efe2376 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -244,9 +244,6 @@ $result_trees{'pxref_test'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -279,7 +276,6 @@ 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'
 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'pxref_test'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'pxref_test'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'pxref_test'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'pxref_test'} = '@node Top
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 16a319f3c3..cab34c7291 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -35,9 +35,6 @@ $result_trees{'quote_node_names_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -221,9 +218,6 @@ $result_trees{'quote_node_names_info'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -392,9 +386,6 @@ $result_trees{'quote_node_names_info'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -532,9 +523,6 @@ $result_trees{'quote_node_names_info'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -730,9 +718,6 @@ $result_trees{'quote_node_names_info'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1986,9 +1971,6 @@ $result_trees{'quote_node_names_info'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2013,9 +1995,7 @@ $result_trees{'quote_node_names_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quote_node_names_info'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[1];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'manual_content'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[2];
@@ -2030,19 +2010,16 @@ 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
@@ -2068,7 +2045,6 @@ $result_trees{'quote_node_names_info'}{'contents'}[3] = 
$result_trees{'quote_nod
 $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'};
 $result_trees{'quote_node_names_info'}{'contents'}[9] = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
-$result_trees{'quote_node_names_info'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
 $result_texis{'quote_node_names_info'} = '@node Top
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 6702d9500f..60f83913bd 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -437,9 +437,6 @@ $result_trees{'ref_tests'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -478,7 +475,6 @@ 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[
 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[1];
 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_tests'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_tests'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_tests'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ref_tests'} = '
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 d1bef49f01..816ac0bd34 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -171,9 +171,6 @@ $result_trees{'space_at_menu_end'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -199,7 +196,6 @@ $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]{'extra'}{'node_content'}[0] 
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 3d442e49ef..2204811e83 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -29,9 +29,6 @@ $result_trees{'space_in_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -229,9 +226,6 @@ $result_trees{'space_in_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,10 +296,8 @@ $result_trees{'space_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_menu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_in_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'space_in_menu'} = '@node Top
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index 9d53471d91..97703d62f1 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -93,9 +93,6 @@ $result_trees{'space_in_setfilename'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -120,7 +117,6 @@ $result_trees{'space_in_setfilename'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_setfilename'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_setfilename'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'space_in_setfilename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'space_in_setfilename'} = '@setfilename @ @verb{: name :}@ 
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index f3e471a496..e110f894fd 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -77,9 +77,6 @@ $result_trees{'split_no_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -277,9 +274,6 @@ $result_trees{'split_no_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -375,10 +369,8 @@ $result_trees{'split_no_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_no_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'split_no_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_no_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'split_no_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'split_no_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_no_copying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'split_no_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'split_no_copying'} = '\\input texinfo
diff --git a/tp/t/results/info_tests/split_nocopying.pl 
b/tp/t/results/info_tests/split_nocopying.pl
index 311c46c5db..3a72b99ce5 100644
--- a/tp/t/results/info_tests/split_nocopying.pl
+++ b/tp/t/results/info_tests/split_nocopying.pl
@@ -50,9 +50,6 @@ $result_trees{'split_nocopying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -256,9 +253,6 @@ $result_trees{'split_nocopying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -344,10 +338,8 @@ $result_trees{'split_nocopying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_nocopying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'split_nocopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_nocopying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'split_nocopying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'split_nocopying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_nocopying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'split_nocopying'}{'contents'}[3]{'args'}[0]{'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 26d37584e6..2bcc0b8914 100644
--- a/tp/t/results/info_tests/split_nocopying_split.pl
+++ b/tp/t/results/info_tests/split_nocopying_split.pl
@@ -50,9 +50,6 @@ $result_trees{'split_nocopying_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -256,9 +253,6 @@ $result_trees{'split_nocopying_split'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -344,10 +338,8 @@ $result_trees{'split_nocopying_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_nocopying_split'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_nocopying_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_nocopying_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[3]{'args'}[0]{'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 a7e2ad34a6..300e82d669 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
@@ -82,9 +82,6 @@ $result_trees{'split_test_before_first_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -282,9 +279,6 @@ $result_trees{'split_test_before_first_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -360,10 +354,8 @@ $result_trees{'split_test_before_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_test_before_first_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_test_before_first_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_test_before_first_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[3]{'args'}[0]{'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 9f33dc8a9c..bfe6fc7337 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
@@ -77,9 +77,6 @@ $result_trees{'split_test_before_first_node_no_empty_line'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -277,9 +274,6 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -355,10 +349,8 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[3]{'args'}[0]{'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 381c46f98d..19f176c0cd 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -29,9 +29,6 @@ $result_trees{'test_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -105,9 +102,6 @@ $result_trees{'test_index'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'a-counting-anchor'
                   },
                   'source_info' => {
@@ -994,9 +988,6 @@ $result_trees{'test_index'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2428,9 +2419,6 @@ $result_trees{'test_index'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2964,9 +2952,7 @@ $result_trees{'test_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_index'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'test_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_index'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[4];
@@ -2995,7 +2981,6 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'conte
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'test_index'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_index'}{'contents'}[3]{'args'}[0]{'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];
@@ -3007,7 +2992,6 @@ 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_nod
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[18];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[170]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[170]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[170];
-$result_trees{'test_index'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'test_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'test_index'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[1];
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index c5baec6a78..0937cde565 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -29,9 +29,6 @@ $result_trees{'text_before_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -224,9 +221,6 @@ $result_trees{'text_before_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -275,10 +269,8 @@ $result_trees{'text_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'text_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'text_before_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'text_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'text_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'text_before_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'text_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'text_before_node'} = '@node Top
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index af36a91366..52f3712a0d 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -208,9 +208,6 @@ $result_trees{'top_node_normalization'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -240,7 +237,6 @@ 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_normalization'} = '@node ToP
diff --git a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
index 977020847c..7f89654483 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -209,9 +209,6 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -327,7 +324,6 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'two_paragraphindent_in_preamble'} = '@copying
diff --git 
a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl 
b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
index b64dbbc673..33d502997b 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
@@ -209,9 +209,6 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -380,7 +377,6 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'two_paragraphindent_in_preamble_and_in_document'} = '@copying
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index 0f0edec057..c94d3c5bf5 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -80,9 +80,6 @@ $result_trees{'unknown_encoding'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -107,7 +104,6 @@ $result_trees{'unknown_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'unknown_encoding'} = '
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index db6d668bb5..d9aadefedd 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -280,9 +280,6 @@ $result_trees{'xref_test'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -317,7 +314,6 @@ 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}
 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[3];
 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1];
 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'xref_test'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'xref_test'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'xref_test'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'xref_test'} = '
diff --git a/tp/t/results/init_files_tests/customize_special_element.pl 
b/tp/t/results/init_files_tests/customize_special_element.pl
index 567ce2cdbe..590786a80c 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -110,9 +110,6 @@ $result_trees{'customize_special_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -190,9 +187,6 @@ $result_trees{'customize_special_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,9 +296,6 @@ $result_trees{'customize_special_element'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -401,11 +392,8 @@ $result_trees{'customize_special_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'customize_special_element'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_special_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_special_element'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_special_element'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_special_element'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_special_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_special_element'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_special_element'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_special_element'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_special_element'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_special_element'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_special_element'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'customize_special_element'} = '
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index f6a76a065f..b6c84246d6 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -56,9 +56,6 @@ $result_trees{'customize_translations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -136,9 +133,6 @@ $result_trees{'customize_translations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -275,9 +269,6 @@ $result_trees{'customize_translations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -382,9 +373,6 @@ $result_trees{'customize_translations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -494,9 +482,6 @@ $result_trees{'customize_translations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -601,9 +586,6 @@ $result_trees{'customize_translations'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -665,17 +647,11 @@ $result_trees{'customize_translations'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'customize_translations'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_translations'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_translations'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_translations'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_translations'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_translations'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_translations'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_translations'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_translations'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_translations'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'customize_translations'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'customize_translations'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'customize_translations'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
 $result_texis{'customize_translations'} = '
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index bdf6a8dd8e..d19c7c0c5c 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -157,9 +157,6 @@ $result_trees{'documentation_examples'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -237,9 +234,6 @@ $result_trees{'documentation_examples'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -482,9 +476,6 @@ $result_trees{'documentation_examples'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -938,11 +929,8 @@ $result_trees{'documentation_examples'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentation_examples'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentation_examples'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'documentation_examples'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentation_examples'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
 $result_trees{'documentation_examples'}{'contents'}[5] = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'extra'}{'label'};
diff --git a/tp/t/results/init_files_tests/undefined_node_filename.pl 
b/tp/t/results/init_files_tests/undefined_node_filename.pl
index 0e1caab86f..433c512b52 100644
--- a/tp/t/results/init_files_tests/undefined_node_filename.pl
+++ b/tp/t/results/init_files_tests/undefined_node_filename.pl
@@ -36,9 +36,6 @@ $result_trees{'undefined_node_filename'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -79,9 +76,6 @@ $result_trees{'undefined_node_filename'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -106,9 +100,7 @@ $result_trees{'undefined_node_filename'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'undefined_node_filename'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'undefined_node_filename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'undefined_node_filename'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'undefined_node_filename'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'undefined_node_filename'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'undefined_node_filename'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'undefined_node_filename'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'undefined_node_filename'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'undefined_node_filename'} = '@node Top
diff --git a/tp/t/results/invalid_nestings/accents.pl 
b/tp/t/results/invalid_nestings/accents.pl
index ad1a430aae..066b3be128 100644
--- a/tp/t/results/invalid_nestings/accents.pl
+++ b/tp/t/results/invalid_nestings/accents.pl
@@ -135,9 +135,6 @@ $result_trees{'accents'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'truc'
                       },
                       'source_info' => {
@@ -170,7 +167,6 @@ $result_trees{'accents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'accents'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'accents'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'accents'} = 'Valid
 @~{@TeX{}}. @~{@@}.
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 9889b18ae5..f685811bb7 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -59,9 +59,6 @@ $result_trees{'center'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-anchor'
                   },
                   'source_info' => {
@@ -1309,7 +1306,6 @@ $result_trees{'center'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl 
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index dd11c509f5..f002cb094b 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -139,9 +139,6 @@ $result_trees{'float_in_style_command'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'A',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'B'
           },
           'info' => {
@@ -163,7 +160,6 @@ $result_trees{'float_in_style_command'} = {
 };
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
 $result_texis{'float_in_style_command'} = '@code{
 }@float A, B
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index a2b70ecdb8..c44824ef01 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -112,9 +112,6 @@ $result_trees{'footnote_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -139,7 +136,6 @@ $result_trees{'footnote_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_in_ref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'footnote_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_ref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'footnote_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'footnote_in_ref'} = '@node first
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 6015cf017a..12148e5176 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -141,9 +141,6 @@ $result_trees{'ignore_in_xref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,7 +167,6 @@ $result_trees{'ignore_in_xref'} = {
 };
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ignore_in_xref'}{'contents'}[1];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ignore_in_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ignore_in_xref'} = '@node first
diff --git a/tp/t/results/invalid_nestings/ignored_text.pl 
b/tp/t/results/invalid_nestings/ignored_text.pl
index cb2dbe9b1e..a06fffd9bd 100644
--- a/tp/t/results/invalid_nestings/ignored_text.pl
+++ b/tp/t/results/invalid_nestings/ignored_text.pl
@@ -65,9 +65,6 @@ $result_trees{'ignored_text'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -92,7 +89,6 @@ $result_trees{'ignored_text'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ignored_text'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ignored_text'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ignored_text'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ignored_text'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ignored_text'} = '@node before ignore in ifinfo
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 1b53c930d5..fb3af6d909 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -27,9 +27,6 @@ $result_trees{'in_errormsg'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'in-ref'
           },
           'source_info' => {
@@ -65,9 +62,6 @@ $result_trees{'in_errormsg'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'in-anchor'
                       },
                       'source_info' => {
@@ -266,8 +260,6 @@ $result_trees{'in_errormsg'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'label'}
 = $result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index d100133b71..958ef53e9b 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -36,9 +36,6 @@ $result_trees{'in_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -240,9 +237,6 @@ $result_trees{'in_table'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'in-anchor'
                               },
                               'source_info' => {
@@ -1008,9 +1002,6 @@ $result_trees{'in_table'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1035,10 +1026,8 @@ $result_trees{'in_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'in_table'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -1051,7 +1040,6 @@ 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'in_table'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'in_table'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'in_table'} = '
diff --git a/tp/t/results/invalid_nestings/menu_in_style_command.pl 
b/tp/t/results/invalid_nestings/menu_in_style_command.pl
index e28f832d1f..e36ba3ef50 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -166,9 +166,6 @@ $result_trees{'menu_in_style_command'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -194,7 +191,6 @@ $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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'menu_in_style_command'} = '@node first
diff --git a/tp/t/results/invalid_nestings/node_in_copying.pl 
b/tp/t/results/invalid_nestings/node_in_copying.pl
index c768f7fe71..8eda1baffd 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -57,9 +57,6 @@ $result_trees{'node_in_copying'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -84,7 +81,6 @@ $result_trees{'node_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'node_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'node_in_copying'} = '@copying
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index 8fc7d13cef..2712250169 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -76,9 +76,6 @@ $result_trees{'node_in_copying_not_closed'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,7 +152,6 @@ $result_trees{'node_in_copying_not_closed'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_in_copying_not_closed'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_in_copying_not_closed'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_in_copying_not_closed'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_in_copying_not_closed'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'node_in_copying_not_closed'} = '@copying
diff --git a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
index b4ac014410..b3f1fbc239 100644
--- a/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -153,9 +153,6 @@ $result_trees{'node_on_index_entry_line'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -208,7 +205,6 @@ $result_trees{'node_on_index_entry_line'} = {
   'type' => 'document_root'
 };
 
$result_trees{'node_on_index_entry_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'node_on_index_entry_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[3];
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl 
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index d4a433ad14..78d34e09d7 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -28,9 +28,6 @@ $result_trees{'on_block_command_line'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'in-anchor'
                       },
                       'source_info' => {
@@ -237,9 +234,6 @@ $result_trees{'on_block_command_line'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-quotation-anchor'
                   },
                   'source_info' => {
@@ -359,9 +353,7 @@ $result_trees{'on_block_command_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'on_block_command_line'} = '@multitable {@anchor{in anchor}} 
@titlefont{in titlefont}
 @item @titlefont{in titlefont}
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 28ebb6d91d..09dd8ec5ba 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -31,9 +31,6 @@ $result_trees{'on_def_line'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'in-anchor'
                           },
                           'source_info' => {
@@ -198,9 +195,6 @@ $result_trees{'on_def_line'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'in-anchorx'
                           },
                           'source_info' => {
@@ -402,12 +396,10 @@ $result_trees{'on_def_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_index_element'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_index_element'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index c0849f1af6..b40bd1ab23 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -59,9 +59,6 @@ $result_trees{'on_index_entry_line'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-anchor'
                   },
                   'source_info' => {
@@ -156,7 +153,6 @@ $result_trees{'on_index_entry_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0];
 
 $result_texis{'on_index_entry_line'} = '@cindex @indent @titlefont{in 
titlefont} @anchor{in anchor}@footnote{footnote} @exdent exdent
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index f8b2e76940..dbad684652 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -59,9 +59,6 @@ $result_trees{'on_itemize_line'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-anchor'
                   },
                   'source_info' => {
@@ -282,7 +279,6 @@ $result_trees{'on_itemize_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'on_itemize_line'} = '@itemize @indent @titlefont{in titlefont} 
@anchor{in anchor}@footnote{footnote} @exdent exdent
 @item in item.
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index 13cfd4d283..9432f07ea3 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -142,9 +142,6 @@ $result_trees{'on_node_line'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'in-anchor'
               },
               'source_info' => {
@@ -219,9 +216,6 @@ $result_trees{'on_node_line'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -261,8 +255,6 @@ $result_trees{'on_node_line'} = {
 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'on_node_line'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_node_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_node_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'on_node_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[4];
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 19773fb20d..1492bd95b1 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -63,9 +63,6 @@ $result_trees{'on_section_line'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'in-anchor'
               },
               'source_info' => {
@@ -148,7 +145,6 @@ $result_trees{'on_section_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_section_line'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'on_section_line'} = '@section @noindent Text @titlefont{in 
titlefont} @anchor{in anchor}@footnote{footnote} @exdent exdent
 ';
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index e8a4f6c2bb..6db7b7a861 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -62,9 +62,6 @@ $result_trees{'on_subheading_line'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-anchor'
                   },
                   'source_info' => {
@@ -150,7 +147,6 @@ $result_trees{'on_subheading_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'on_subheading_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'on_subheading_line'} = '@subheading @noindent Text 
@titlefont{in titlefont} @anchor{in anchor}@footnote{footnote} @exdent exdent
 ';
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index ee0844a238..5b0f796dcf 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -139,9 +139,6 @@ $result_trees{'quotation_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -166,7 +163,6 @@ $result_trees{'quotation_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quotation_in_ref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'quotation_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'quotation_in_ref'} = '@node first
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index c36e0d313a..b9335267fe 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -87,9 +87,6 @@ $result_trees{'ref_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -118,7 +115,6 @@ 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}
 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ref_in_ref'}{'contents'}[1];
 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_ref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_ref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ref_in_ref'} = '@node first
diff --git a/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl 
b/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
index 15ce53d8c5..acca864f95 100644
--- a/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_to_top_in_anchor.pl
@@ -69,10 +69,6 @@ $result_trees{'ref_to_top_in_anchor'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {},
-              {}
-            ],
             'normalized' => 'TOP-Top'
           },
           'source_info' => {
@@ -87,9 +83,6 @@ $result_trees{'ref_to_top_in_anchor'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +109,6 @@ $result_trees{'ref_to_top_in_anchor'} = {
 };
 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'ref_to_top_in_anchor'}{'contents'}[1];
 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}[1]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'ref_to_top_in_anchor'} = '@node Top
diff --git a/tp/t/results/invalid_nestings/section_on_float_line.pl 
b/tp/t/results/invalid_nestings/section_on_float_line.pl
index 6ad5e031cd..af9aa16190 100644
--- a/tp/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_float_line.pl
@@ -39,9 +39,6 @@ $result_trees{'section_on_float_line'} = {
           'cmdname' => 'float',
           'extra' => {
             'float_type' => 't',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'l'
           },
           'info' => {
@@ -90,7 +87,6 @@ $result_trees{'section_on_float_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_on_float_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_on_float_line'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
 $result_texis{'section_on_float_line'} = '@float t, l @section first
 ';
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl 
b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index 1a1b9ddcb6..c93ea125a1 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -71,9 +71,6 @@ $result_trees{'style_not_closed_before_first_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -98,7 +95,6 @@ $result_trees{'style_not_closed_before_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_before_first_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_before_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'style_not_closed_before_first_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'style_not_closed_before_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'style_not_closed_before_first_node'} = '@code{in code
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 7964df660a..20f36fa737 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
@@ -29,9 +29,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -239,9 +236,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -337,10 +331,8 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'style_not_closed_no_newline_root_commands'} = '@node 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 c82eaf047e..1787d8fcf2 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
@@ -29,9 +29,6 @@ $result_trees{'style_not_closed_root_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -244,9 +241,6 @@ $result_trees{'style_not_closed_root_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -347,10 +341,8 @@ $result_trees{'style_not_closed_root_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'style_not_closed_root_commands'} = '@node Top
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 6c8b99736a..d04b52d298 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -139,9 +139,6 @@ $result_trees{'verbatim_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -166,7 +163,6 @@ $result_trees{'verbatim_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verbatim_in_ref'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_ref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'verbatim_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'verbatim_in_ref'} = '@node first
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 9622c8f681..45a8c0b5e1 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -35,9 +35,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1070,9 +1064,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index 260e96fc99..c94eb2437d 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -35,9 +35,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -717,9 +711,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 8a14a817d7..80547e1e17 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -73,9 +73,6 @@ $result_trees{'appendix_translated'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -188,7 +185,6 @@ $result_trees{'appendix_translated'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'appendix_translated'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'appendix_translated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'appendix_translated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'appendix_translated'} = '@documentlanguage fr
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index 6cff7ca486..9e8dd3bd07 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -73,9 +73,6 @@ $result_trees{'command_translated'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -206,10 +203,6 @@ $result_trees{'command_translated'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -265,10 +258,7 @@ $result_trees{'command_translated'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'command_translated'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'command_translated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'command_translated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'command_translated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'command_translated'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'command_translated'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'command_translated'}{'contents'}[3]{'extra'}{'node_content'}[1] 
= $result_trees{'command_translated'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'command_translated'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'command_translated'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'command_translated'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = $result_trees{'command_translated'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index ba700eea04..24a438f722 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -381,9 +381,6 @@ $result_trees{'documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -462,9 +459,6 @@ $result_trees{'documentlanguage'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -807,9 +801,7 @@ $result_trees{'documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'documentlanguage'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'documentlanguage'}{'contents'}[3];
 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 12bfe242c1..60e2751a7d 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -381,9 +381,6 @@ $result_trees{'documentlanguage_option'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -462,9 +459,6 @@ $result_trees{'documentlanguage_option'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -807,9 +801,7 @@ $result_trees{'documentlanguage_option'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage_option'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage_option'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'documentlanguage_option'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage_option'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'documentlanguage_option'}{'contents'}[3];
 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index 6867bbe76c..162a745321 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -381,9 +381,6 @@ $result_trees{'documentlanguage_unknown'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -462,9 +459,6 @@ $result_trees{'documentlanguage_unknown'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -807,9 +801,7 @@ $result_trees{'documentlanguage_unknown'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage_unknown'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'documentlanguage_unknown'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'documentlanguage_unknown'}{'contents'}[3];
 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index 474144d331..2c96852f28 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -316,9 +316,6 @@ $result_trees{'multiple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -397,9 +394,6 @@ $result_trees{'multiple_documentlanguage'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -997,9 +991,7 @@ 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index b08cc8863d..95319f0954 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -353,9 +353,6 @@ $result_trees{'multiple_in_preamble'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -433,9 +430,6 @@ $result_trees{'multiple_in_preamble'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -890,9 +884,7 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple_in_preamble'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_in_preamble'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index c90a39fca8..2dd529d38c 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -404,9 +404,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -484,9 +481,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -741,9 +735,7 @@ 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index a4246339ca..2f5f28cd83 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -265,9 +265,6 @@ $result_trees{'multiple_lang_chapters'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -675,9 +672,6 @@ $result_trees{'multiple_lang_chapters'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -989,9 +983,6 @@ $result_trees{'multiple_lang_chapters'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1303,9 +1294,6 @@ $result_trees{'multiple_lang_chapters'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1578,9 +1566,6 @@ $result_trees{'multiple_lang_chapters'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1690,9 +1675,6 @@ $result_trees{'multiple_lang_chapters'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1793,14 +1775,12 @@ $result_trees{'multiple_lang_chapters'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[3]{'args'}[0]{'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];
@@ -1813,7 +1793,6 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1826,7 +1805,6 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[5];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1837,9 +1815,7 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 5c77515a5d..2179fc7bb5 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -265,9 +265,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -675,9 +672,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -989,9 +983,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1303,9 +1294,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1578,9 +1566,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1690,9 +1675,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1793,14 +1775,12 @@ $result_trees{'multiple_lang_chapters_latex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[3]{'args'}[0]{'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];
@@ -1813,7 +1793,6 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1826,7 +1805,6 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1837,9 +1815,7 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[7];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index da0e505614..58c99a7369 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -232,9 +232,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -642,9 +639,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -956,9 +950,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1270,9 +1261,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1545,9 +1533,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1657,9 +1642,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1760,14 +1742,12 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3]{'args'}[0]{'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];
@@ -1780,7 +1760,6 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1793,7 +1772,6 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -1804,9 +1782,7 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index b5d985d799..1164c34ba2 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -73,9 +73,6 @@ $result_trees{'simple_documentlanguage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -281,9 +278,6 @@ $result_trees{'simple_documentlanguage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -308,7 +302,6 @@ $result_trees{'simple_documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple_documentlanguage'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_documentlanguage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -319,7 +312,6 @@ 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'simple_documentlanguage'}{'contents'}[2];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple_documentlanguage'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simple_documentlanguage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'simple_documentlanguage'} = '@documentlanguage fr
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 9e000dc8fa..65c6069abb 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -73,9 +73,6 @@ $result_trees{'unknown_language'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -153,9 +150,6 @@ $result_trees{'unknown_language'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -337,9 +331,7 @@ $result_trees{'unknown_language'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_language'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_language'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_language'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_language'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'unknown_language'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_language'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_language'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_language'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'unknown_language'}{'contents'}[1];
 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 189b648c01..b184076c98 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -73,9 +73,6 @@ $result_trees{'unknown_region'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -281,9 +278,6 @@ $result_trees{'unknown_region'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -308,7 +302,6 @@ $result_trees{'unknown_region'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_region'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]
 = 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[2]
 = 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -319,7 +312,6 @@ 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'ex
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'unknown_region'}{'contents'}[2];
 
$result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'unknown_region'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'unknown_region'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_region'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_region'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'unknown_region'} = '@documentlanguage fr_NOWHERE
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index 058385dbca..83ff5a07e3 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -36,9 +36,6 @@ $result_trees{'anchor_before_top'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'a-before-Top'
           },
           'source_info' => {
@@ -79,9 +76,6 @@ $result_trees{'anchor_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -159,9 +153,6 @@ $result_trees{'anchor_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -259,10 +250,7 @@ $result_trees{'anchor_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_before_top'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_before_top'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_before_top'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_before_top'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'anchor_before_top'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 07360a28e7..28c421b151 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -46,9 +46,6 @@ $result_trees{'anchor_in_copying'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'a-in-copying'
                       },
                       'source_info' => {
@@ -133,9 +130,6 @@ $result_trees{'anchor_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -213,9 +207,6 @@ $result_trees{'anchor_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -313,10 +304,7 @@ $result_trees{'anchor_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
index d89a0df698..c1cf11dc6b 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
@@ -46,9 +46,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'a-in-copying'
                       },
                       'source_info' => {
@@ -133,9 +130,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -213,9 +207,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -374,10 +365,7 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index bee40a3883..83c90cf50f 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -46,9 +46,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'a-in-copying'
                       },
                       'source_info' => {
@@ -182,9 +179,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'a-in-titlepage'
                   },
                   'source_info' => {
@@ -282,9 +276,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -362,9 +353,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -493,11 +481,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index e1970c0097..ce8753a300 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -46,9 +46,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'a-in-copying'
                       },
                       'source_info' => {
@@ -250,9 +247,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -330,9 +324,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -491,10 +482,7 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index e53c693f97..657da8c06b 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -59,9 +59,6 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anch_003a-in-node-before'
               },
               'source_info' => {
@@ -85,9 +82,6 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -128,9 +122,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -195,9 +186,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anch_003a-in-node-top'
               },
               'source_info' => {
@@ -275,9 +263,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anch_003a-in-node-after'
               },
               'source_info' => {
@@ -301,9 +286,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -344,9 +326,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -411,9 +390,6 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anch_003a-in-chap'
               },
               'source_info' => {
@@ -782,18 +758,10 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
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 4e2be1b213..f0975734c0 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -128,9 +128,6 @@ $result_trees{'custom_heading_with_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -228,9 +225,6 @@ $result_trees{'custom_heading_with_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -504,9 +498,6 @@ $result_trees{'custom_heading_with_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -690,9 +681,6 @@ $result_trees{'custom_heading_with_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -876,9 +864,6 @@ $result_trees{'custom_heading_with_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2150,9 +2135,6 @@ $result_trees{'custom_heading_with_include'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2214,19 +2196,13 @@ $result_trees{'custom_heading_with_include'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_heading_with_include'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_heading_with_include'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_heading_with_include'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_heading_with_include'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
 $result_texis{'custom_heading_with_include'} = '@setchapternewpage odd
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 9121299cbb..50304bd014 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
@@ -143,9 +143,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -243,9 +240,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -519,9 +513,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -705,9 +696,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -891,9 +879,6 @@ $result_trees{'custom_heading_with_include_in_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2165,9 +2150,6 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2229,19 +2211,13 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
 $result_texis{'custom_heading_with_include_in_command'} = '@setchapternewpage 
odd
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index d4946d8b77..f9b4f6aeae 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -196,9 +196,6 @@ $result_trees{'custom_headings'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -276,9 +273,6 @@ $result_trees{'custom_headings'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -671,9 +665,7 @@ $result_trees{'custom_headings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_headings'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'custom_headings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_headings'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'custom_headings'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'custom_headings'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'custom_headings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'custom_headings'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'custom_headings'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'custom_headings'} = '
diff --git a/tp/t/results/latex_tests/error_in_sectioning_command.pl 
b/tp/t/results/latex_tests/error_in_sectioning_command.pl
index 0fe5800fe2..825bab3ee2 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -56,9 +56,6 @@ $result_trees{'error_in_sectioning_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -179,12 +176,6 @@ $result_trees{'error_in_sectioning_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -317,12 +308,7 @@ $result_trees{'error_in_sectioning_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'error_in_sectioning_command'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'node_content'}[3]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[3];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'error_in_sectioning_command'}{'contents'}[3]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index fc5c2e8ae7..8a0c34100d 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -35,9 +35,6 @@ $result_trees{'float_and_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'float_and_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -296,9 +290,6 @@ $result_trees{'float_and_refs'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'no-type',
             'shortcaption' => {}
           },
@@ -456,9 +447,6 @@ $result_trees{'float_and_refs'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Thing',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'with-type',
             'shortcaption' => {}
           },
@@ -616,9 +604,6 @@ $result_trees{'float_and_refs'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'Figure',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'my-figure',
             'shortcaption' => {}
           },
@@ -1690,27 +1675,22 @@ $result_trees{'float_and_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_and_refs'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'float_and_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'float_and_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'float_and_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'float_and_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[3];
 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index d5a8c1b8bf..0b90f6d089 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -75,9 +75,6 @@ $result_trees{'fonttextsize'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,9 +152,6 @@ $result_trees{'fonttextsize'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -537,9 +531,7 @@ $result_trees{'fonttextsize'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'fonttextsize'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'fonttextsize'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'fonttextsize'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'fonttextsize'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'fonttextsize'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'fonttextsize'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'fonttextsize'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'fonttextsize'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'fonttextsize'} = '@fonttextsize 10
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 998260e90e..2602a6ef11 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -74,9 +74,6 @@ $result_trees{'indices'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,9 +152,6 @@ $result_trees{'indices'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1213,9 +1207,7 @@ $result_trees{'indices'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'} 
= $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 72b3f53613..1497b5b3a3 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -74,9 +74,6 @@ $result_trees{'indices_disable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -155,9 +152,6 @@ $result_trees{'indices_disable_encoding'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1213,9 +1207,7 @@ $result_trees{'indices_disable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices_disable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_disable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1];
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index 273e0675b5..af4ecf4179 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -35,9 +35,6 @@ $result_trees{'informative_commands_in_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -267,9 +264,6 @@ $result_trees{'informative_commands_in_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -340,9 +334,7 @@ $result_trees{'informative_commands_in_top_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'informative_commands_in_top_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'informative_commands_in_top_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'informative_commands_in_top_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'informative_commands_in_top_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'informative_commands_in_top_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'informative_commands_in_top_node'} = '@node Top
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 9cda39ba12..7100d95ac5 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -42,9 +42,6 @@ $result_trees{'node_before_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -85,9 +82,6 @@ $result_trees{'node_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -165,9 +159,6 @@ $result_trees{'node_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -265,11 +256,8 @@ $result_trees{'node_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_before_top'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'node_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_before_top'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'node_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'node_before_top'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'node_before_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_before_top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_before_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'node_before_top'}{'contents'}[1];
 
$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 50d781c01e..7acad5ad99 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -70,9 +70,6 @@ $result_trees{'pagesizes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -150,9 +147,6 @@ $result_trees{'pagesizes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -347,9 +341,7 @@ $result_trees{'pagesizes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'pagesizes'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'pagesizes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'pagesizes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'pagesizes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'pagesizes'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'pagesizes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'pagesizes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'pagesizes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'pagesizes'} = '@pagesizes 200mm,150mm
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index 354f6b9d4f..671dc87ae1 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -76,9 +76,6 @@ $result_trees{'pagetype'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -156,9 +153,6 @@ $result_trees{'pagetype'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -342,9 +336,7 @@ $result_trees{'pagetype'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'pagetype'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'pagetype'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'pagetype'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'pagetype'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'pagetype'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'pagetype'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'pagetype'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'pagetype'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'pagetype'} = '@afourpaper
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 7f600b5a85..a28ea17493 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -76,9 +76,6 @@ $result_trees{'shorttitlepage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -156,9 +153,6 @@ $result_trees{'shorttitlepage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -229,9 +223,7 @@ $result_trees{'shorttitlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'shorttitlepage'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'shorttitlepage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'shorttitlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'shorttitlepage'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'shorttitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'shorttitlepage'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'shorttitlepage'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'shorttitlepage'} = '@shorttitlepage the title with 
shorttitlepage @* it can be long
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 07ad5648bd..c2d0be0077 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -384,9 +384,6 @@ $result_trees{'titlepage_classical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -464,9 +461,6 @@ $result_trees{'titlepage_classical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -544,9 +538,7 @@ $result_trees{'titlepage_classical'} = {
 };
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_classical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_classical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_classical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_classical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_classical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titlepage_classical'} = '@copying
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 6c8aa519d6..bf222db911 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -35,9 +35,6 @@ $result_trees{'titlepage_in_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -216,9 +213,6 @@ $result_trees{'titlepage_in_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -289,9 +283,7 @@ $result_trees{'titlepage_in_top_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_in_top_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_in_top_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titlepage_in_top_node'} = '@node Top
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index ef841155e5..c732fd4be2 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -134,9 +134,6 @@ $result_trees{'titlepage_long_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -214,9 +211,6 @@ $result_trees{'titlepage_long_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +281,7 @@ $result_trees{'titlepage_long_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_long_title'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_long_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_long_title'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_long_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_long_title'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_long_title'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_long_title'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titlepage_long_title'} = '@titlepage
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index d3a4fba126..8b1af8eff6 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -123,9 +123,6 @@ $result_trees{'titlepage_no_author'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -203,9 +200,6 @@ $result_trees{'titlepage_no_author'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -276,9 +270,7 @@ $result_trees{'titlepage_no_author'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'titlepage_no_author'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_no_author'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_no_author'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_no_author'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_no_author'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_no_author'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_no_author'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titlepage_no_author'} = '@titlepage
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index db85e9452d..ad296f5ba6 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -153,9 +153,6 @@ $result_trees{'titlepage_no_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -233,9 +230,6 @@ $result_trees{'titlepage_no_title'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -307,9 +301,7 @@ $result_trees{'titlepage_no_title'} = {
   'type' => 'document_root'
 };
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'titlepage_no_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_no_title'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'titlepage_no_title'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'titlepage_no_title'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_no_title'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'titlepage_no_title'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titlepage_no_title'} = '@titlepage
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index a58a9b406a..45a32a88e5 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -537,9 +537,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -617,9 +614,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -697,9 +691,7 @@ $result_trees{'titlepage_with_commands_classical'} = {
 };
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[3]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'titlepage'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'titlepage_with_commands_classical'} = '@copying
diff --git a/tp/t/results/latex_tests/top_no_sectioning_command.pl 
b/tp/t/results/latex_tests/top_no_sectioning_command.pl
index 64633b6ccb..fa383d03c5 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -42,9 +42,6 @@ $result_trees{'top_no_sectioning_command'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -85,9 +82,6 @@ $result_trees{'top_no_sectioning_command'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -185,9 +179,7 @@ $result_trees{'top_no_sectioning_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_no_sectioning_command'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_no_sectioning_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'top_no_sectioning_command'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_no_sectioning_command'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'top_no_sectioning_command'}{'contents'}[1];
 
$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 3c59a95a2b..09c462c3e7 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation'}{'contents'}[7]{'args'}[0]{'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 84f7a77232..eeba394af4 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_chapter'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_chapter'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_chapter'}{'contents'}[7]{'args'}[0]{'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 189b9d9661..469770881e 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_chapter_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_chapter_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_chapter_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_chapter_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_chapter_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'args'}[0]{'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 358e17141f..a8fb77e77c 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'args'}[0]{'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 23791ee532..4c50f5269d 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_chapter_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_chapter_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_chapter_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_chapter_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_chapter_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'args'}[0]{'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 f018b40813..04a5b89773 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[7]{'args'}[0]{'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 3c20a2deb3..3c91271275 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'args'}[0]{'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 6cc7cbf909..40d4ee9fac 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_node'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_node'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'navigation_node'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_node'}{'contents'}[7]{'args'}[0]{'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 eaeae7d0e3..94a0abf55b 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_node_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_node_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_node_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_node_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_node_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[7]{'args'}[0]{'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 741975d41d..b0966fe53d 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_node_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'args'}[0]{'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 2a042aa1c9..495020d243 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_node_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_node_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_node_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_node_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_node_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[7]{'args'}[0]{'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 c8f505affe..6677fd6573 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_section'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_section'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_section'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0] 
= $result_trees{'navigation_section'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'navigation_section'}{'contents'}[7]{'args'}[0]{'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 6966f9e899..77e5d4a958 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_section_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_section_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_section_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_section_no_header'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_section_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[7]{'args'}[0]{'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 d7c07039d9..cd2bd0a129 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_section_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'args'}[0]{'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 4d89607a77..8caf2cb82c 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_section_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_section_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_section_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_section_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_section_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[7]{'args'}[0]{'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 8f658ae4dc..7810f0aee7 100644
--- a/tp/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_test_misc_file_collision'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'args'}[0]{'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 7bd09ba3ff..0e20070069 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -50,9 +50,6 @@ $result_trees{'navigation_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -236,9 +233,6 @@ $result_trees{'navigation_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +416,6 @@ $result_trees{'navigation_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -794,9 +785,6 @@ $result_trees{'navigation_vertical'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -888,16 +876,12 @@ $result_trees{'navigation_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[7]{'args'}[0]{'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 bac9ba4519..042e113e15 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -50,9 +50,6 @@ $result_trees{'no_monolithic'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -321,9 +318,6 @@ $result_trees{'no_monolithic'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -478,12 +472,10 @@ $result_trees{'no_monolithic'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_monolithic'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_monolithic'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'no_monolithic'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_monolithic'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_monolithic'}{'contents'}[3]{'args'}[0]{'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 e0290b05da..f578e77120 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -50,9 +50,6 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -321,9 +318,6 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -478,12 +472,10 @@ $result_trees{'no_monolithic_only_toc_out'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 6d96fd20fa..44c9831020 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -29,9 +29,6 @@ $result_trees{'backslash_in_arg'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -471,9 +468,6 @@ $result_trees{'backslash_in_arg'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -498,7 +492,6 @@ $result_trees{'backslash_in_arg'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[3];
@@ -508,7 +501,6 @@ 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'elemen
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[6];
-$result_trees{'backslash_in_arg'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'backslash_in_arg'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'backslash_in_arg'} = '@node Top
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index d7fdabdb4d..d37850c612 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -3628,9 +3628,6 @@ $result_trees{'bib_example'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3921,9 +3918,6 @@ $result_trees{'bib_example'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4272,9 +4266,6 @@ $result_trees{'bib_example'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -4693,9 +4684,6 @@ $result_trees{'bib_example'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'LaTeX2e'
                   },
                   'source_info' => {
@@ -4963,18 +4951,14 @@ $result_trees{'bib_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'bib_example'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'bib_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'bib_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'bib_example'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'bib_example'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'args'}[0]{'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'};
-$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'bib_example'} = '\\input texinfo   @c -*-texinfo-*-
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index b6c61acd4c..1e56a20557 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -381,9 +381,6 @@ $result_trees{'glossary'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1096,9 +1093,6 @@ $result_trees{'glossary'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'id2'
                   },
                   'source_info' => {
@@ -1498,9 +1492,6 @@ $result_trees{'glossary'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1638,13 +1629,10 @@ $result_trees{'glossary'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'glossary'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'glossary'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'glossary'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'glossary'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[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'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'extra'}{'label'}{'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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'glossary'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'glossary'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'glossary'}{'contents'}[3]{'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_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 5169e447a6..8b94687e2c 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -750,9 +750,6 @@ $result_trees{'macro_in_index_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1301,9 +1298,6 @@ $result_trees{'macro_in_index_commands'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1328,7 +1322,6 @@ $result_trees{'macro_in_index_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[1];
@@ -1338,7 +1331,6 @@ 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[6];
-$result_trees{'macro_in_index_commands'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'macro_in_index_commands'} = '@macro cp
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index a5b9fc843d..ebc5829d09 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -163,9 +163,6 @@ $result_trees{'macro_in_misc_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5046,9 +5043,6 @@ $result_trees{'macro_in_misc_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -5353,10 +5347,8 @@ $result_trees{'macro_in_misc_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'macro_in_misc_commands'} = '@macro text 
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 0835cc2db1..a9e28f45e8 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -29,9 +29,6 @@ $result_trees{'block_commands_in_menu_description'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -592,7 +589,6 @@ $result_trees{'block_commands_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 176000cfd4..9183d1b962 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -159,9 +159,6 @@ $result_trees{'comment_on_menu_line'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -232,9 +229,6 @@ $result_trees{'comment_on_menu_line'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -260,9 +254,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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'comment_on_menu_line'} = '@node Top
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 4c5b137a93..a489b78eb3 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -29,9 +29,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -562,9 +559,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -748,9 +742,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -828,9 +819,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1062,9 +1050,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1142,9 +1127,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1199,25 +1181,19 @@ $result_trees{'detailmenu_on_subnodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
 $result_texis{'detailmenu_on_subnodes'} = '@node Top
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index f3585f18ed..f27616069e 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -190,9 +190,6 @@ $result_trees{'detailmenu_unknown_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -218,7 +215,6 @@ $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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 83b2bed9cf..6fcde8023c 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -29,9 +29,6 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -240,7 +237,6 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
 
diff --git a/tp/t/results/menu/empty_menu_description.pl 
b/tp/t/results/menu/empty_menu_description.pl
index 916f7c704b..cb26238152 100644
--- a/tp/t/results/menu/empty_menu_description.pl
+++ b/tp/t/results/menu/empty_menu_description.pl
@@ -167,9 +167,6 @@ $result_trees{'empty_menu_description'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -197,7 +194,6 @@ $result_trees{'empty_menu_description'} = {
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 63efcfe949..0400047a2b 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -209,9 +209,6 @@ $result_trees{'empty_menu_entry_name'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -252,9 +249,6 @@ $result_trees{'empty_menu_entry_name'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -281,9 +275,7 @@ $result_trees{'empty_menu_entry_name'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_menu_entry_name'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_menu_entry_name'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]{'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 42539971cc..4deb2e4cd0 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -431,9 +431,6 @@ $result_trees{'entry_after_detailmenu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -474,9 +471,6 @@ $result_trees{'entry_after_detailmenu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -517,9 +511,6 @@ $result_trees{'entry_after_detailmenu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -548,11 +539,8 @@ 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'entry_after_detailmenu'} = '@node Top
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 4abc0da6f1..eeb2789a4c 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -29,9 +29,6 @@ $result_trees{'example_in_menu_description'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -285,7 +282,6 @@ $result_trees{'example_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'example_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'example_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
 
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index f436a0bd42..d0b2c10cd1 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -688,9 +688,6 @@ $result_trees{'formats_in_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -720,7 +717,6 @@ 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'e
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 8e73b97182..d4939a8c06 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -29,9 +29,6 @@ $result_trees{'inlineraw_in_menu_description'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -262,7 +259,6 @@ $result_trees{'inlineraw_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
 
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index a3ecd94c32..c9d1ebdea1 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -512,9 +512,6 @@ $result_trees{'invalid_info_menu_entry'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -549,7 +546,6 @@ 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'invalid_info_menu_entry'} = '@node first
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index ea06df0637..99891d431e 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -263,9 +263,6 @@ $result_trees{'menu_in_deffn'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -296,7 +293,6 @@ 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ext
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 4d0f2e87fb..461d5953ce 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -482,9 +482,6 @@ $result_trees{'menu_in_example'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -514,7 +511,6 @@ 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'c
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[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]{'extra'}{'node_content'}[0] = 
$result_trees{'menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'menu_in_example'} = '@node first
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index e4d3113e47..6ea213bf0a 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -137,9 +137,6 @@ $result_trees{'menu_node_unterminated'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -166,7 +163,6 @@ $result_trees{'menu_node_unterminated'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 1584c3b9e8..c44c045f29 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -29,9 +29,6 @@ $result_trees{'menu_pointing_to_anchor'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -104,9 +101,6 @@ $result_trees{'menu_pointing_to_anchor'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'An-anchor'
           },
           'source_info' => {
@@ -242,9 +236,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$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_texis{'menu_pointing_to_anchor'} = '@node Top
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 75f67bc18a..de27ea467c 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -156,9 +156,6 @@ $result_trees{'menu_title_before_entries'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -199,9 +196,6 @@ $result_trees{'menu_title_before_entries'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -227,9 +221,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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'menu_title_before_entries'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_title_before_entries'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]{'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 1fa307e4c7..2118945e98 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -29,9 +29,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -446,9 +443,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -632,9 +626,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -712,9 +703,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -946,9 +934,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1026,9 +1011,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1083,25 +1065,19 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
 $result_texis{'missing_detailmenu_on_subnodes'} = '@node Top
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index 0b48b4461c..1af6a69bb1 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -267,9 +267,6 @@ $result_trees{'multiple_menus'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -298,7 +295,6 @@ 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ex
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'multiple_menus'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'multiple_menus'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'multiple_menus'} = '@node Top
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 94745978a9..3bd1ffe544 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -103,9 +103,6 @@ $result_trees{'no_colon_in_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,7 +127,6 @@ $result_trees{'no_colon_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'no_colon_in_menu'} = '@node first
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 0059583333..175b1db152 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -149,9 +149,6 @@ $result_trees{'reference_to_external_manual'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -177,7 +174,6 @@ $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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'reference_to_external_manual'} = '
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index fa4b097e71..21fd6c39aa 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -403,9 +403,6 @@ $result_trees{'sc_in_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -736,9 +733,6 @@ $result_trees{'sc_in_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -764,11 +758,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'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sc_in_menu'}{'contents'}[1]{'args'}[0]{'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'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'sc_in_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 309db8b565..08d27e4e2b 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
@@ -29,9 +29,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -697,11 +694,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -758,7 +750,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
@@ -783,9 +774,6 @@ 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'extra'}{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[3]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index faa7b4e3a1..317f3897a2 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -596,9 +596,6 @@ $result_trees{'submenu_in_example'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -623,7 +620,6 @@ $result_trees{'submenu_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'submenu_in_example'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'submenu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'submenu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'submenu_in_example'} = '@node first
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index f619f7aea9..e4e2e2f60a 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -29,9 +29,6 @@ $result_trees{'verb_in_menu_description'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -246,7 +243,6 @@ $result_trees{'verb_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verb_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'verb_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
 
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index e92665ecd5..2060bd373f 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -1523,9 +1523,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1603,9 +1600,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3962,9 +3956,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'codequoteundirected_codequotebacktick'} = '@macro quotes
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 31b2a73b9e..a3a1c08624 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -96,9 +96,6 @@ $result_trees{'comment_space_command_on_line'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -210,9 +207,6 @@ $result_trees{'comment_space_command_on_line'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -639,9 +633,6 @@ $result_trees{'comment_space_command_on_line'} = {
           'extra' => {
             'float_section' => {},
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'label'
           },
           'info' => {
@@ -738,14 +729,11 @@ $result_trees{'comment_space_command_on_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[3];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[11]{'extra'}{'float_section'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
-$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[11]{'args'}[1]{'contents'}[0];
 
 $result_texis{'comment_space_command_on_line'} = '@settitle Settitle @ @c 
settittle
 
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 42c1ec76dd..ca1e31c67d 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -35,9 +35,6 @@ $result_trees{'ref_in_center'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'ref_in_center'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -301,9 +295,7 @@ $result_trees{'ref_in_center'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_center'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_center'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_center'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_center'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_in_center'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_center'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_center'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ref_in_center'}{'contents'}[1];
 
$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 6f6d018cfc..a98f020fcb 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -35,9 +35,6 @@ $result_trees{'test_allowcodebreaks'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -559,9 +556,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'A-node0'
                       },
                       'source_info' => {
@@ -1053,9 +1047,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'A-node1'
                       },
                       'source_info' => {
@@ -1516,9 +1507,6 @@ $result_trees{'test_allowcodebreaks'} = {
                               ],
                               'cmdname' => 'anchor',
                               'extra' => {
-                                'node_content' => [
-                                  {}
-                                ],
                                 'normalized' => 'A-nodew'
                               },
                               'source_info' => {
@@ -2014,9 +2002,6 @@ $result_trees{'test_allowcodebreaks'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'A-node2'
                       },
                       'source_info' => {
@@ -2163,9 +2148,6 @@ $result_trees{'test_allowcodebreaks'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2190,13 +2172,7 @@ $result_trees{'test_allowcodebreaks'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[5]{'contents'}[20]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[5]{'contents'}[20]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[10]{'contents'}[20]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[10]{'contents'}[20]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[19]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[19]{'contents'}[20]{'args'}[0]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'contents'}[19]{'contents'}[20]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'test_allowcodebreaks'} = '@node Top
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl 
b/tp/t/results/misc_commands/text_before_line_command.pl
index f618bff985..69c6ad937f 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -91,9 +91,6 @@ $result_trees{'text_before_line_command'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -285,7 +282,6 @@ $result_trees{'text_before_line_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_line_command'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'text_before_line_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'text_before_line_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'text_before_line_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'extra'}{'authors'}[0]
 = 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 826a7f8604..4fd96b26d6 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -29,9 +29,6 @@ $result_trees{'anchor_in_footnote'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -105,9 +102,6 @@ $result_trees{'anchor_in_footnote'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'Anchor-in-footnote'
                           },
                           'source_info' => {
@@ -284,9 +278,6 @@ $result_trees{'anchor_in_footnote'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -384,11 +375,8 @@ $result_trees{'anchor_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_footnote'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_footnote'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_footnote'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_footnote'}{'contents'}[3]{'args'}[0]{'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 3fd476f1dc..d06bbb6c46 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -65,9 +65,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -141,9 +138,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
                           ],
                           'cmdname' => 'anchor',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'normalized' => 'Anchor-in-footnote'
                           },
                           'source_info' => {
@@ -320,9 +314,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -420,11 +411,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[3]{'args'}[0]{'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 9d806a6c2d..bce6f6ab2f 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -35,9 +35,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -269,9 +266,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -717,9 +711,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -842,9 +833,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1000,9 +988,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
                     }
                   ],
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1131,9 +1116,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1428,11 +1410,9 @@ $result_trees{'character_and_spaces_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[3]{'args'}[0]{'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];
@@ -1440,13 +1420,11 @@ 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'con
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -1454,12 +1432,10 @@ 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'con
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'label'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[2]{'contents'}[0];
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 2bc8f6e9e4..d91b6da200 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -36,9 +36,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -278,9 +275,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -726,9 +720,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       }
                     ],
                     'extra' => {
-                      'node_content' => [
-                        {}
-                      ],
                       'nodes_manuals' => [
                         {
                           'node_content' => [
@@ -851,9 +842,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       }
                     ],
                     'extra' => {
-                      'node_content' => [
-                        {}
-                      ],
                       'nodes_manuals' => [
                         {
                           'node_content' => [
@@ -1009,9 +997,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       }
                     ],
                     'extra' => {
-                      'node_content' => [
-                        {}
-                      ],
                       'nodes_manuals' => [
                         {
                           'node_content' => [
@@ -1148,9 +1133,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1473,12 +1455,10 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} 
= $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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];
@@ -1486,13 +1466,11 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'manual_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
@@ -1500,13 +1478,11 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'extra'}{'label'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[1]{'extra'}{'unit_command'} 
= $result_trees{'character_and_spaces_in_refs_out'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/moresectioning/complex.pl 
b/tp/t/results/moresectioning/complex.pl
index 1c9fe849fe..18e73076dc 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -58,9 +58,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -507,9 +504,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -834,9 +828,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1172,9 +1163,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1260,9 +1248,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1348,9 +1333,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1436,9 +1418,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1524,9 +1503,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1718,9 +1694,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1811,9 +1784,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1926,9 +1896,6 @@ $result_trees{'complex'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2025,9 +1992,6 @@ $result_trees{'complex'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2140,9 +2104,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2279,9 +2240,6 @@ $result_trees{'complex'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2436,9 +2394,6 @@ $result_trees{'complex'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2490,7 +2445,6 @@ $result_trees{'complex'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'complex'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'complex'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = $result_trees{'complex'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
@@ -2501,7 +2455,6 @@ 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[0]{'contents'}[2];
-$result_trees{'complex'}[1]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'complex'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'complex'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
@@ -2509,52 +2462,39 @@ 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[1]{'contents'}[1];
-$result_trees{'complex'}[2]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[2]{'contents'}[1];
-$result_trees{'complex'}[3]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[3]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[3]{'contents'}[1];
-$result_trees{'complex'}[4]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[4]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[4]{'contents'}[1];
-$result_trees{'complex'}[5]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[5]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[5]{'contents'}[1];
-$result_trees{'complex'}[6]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[6]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[6]{'contents'}[1];
-$result_trees{'complex'}[7]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[7]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[7]{'contents'}[1];
-$result_trees{'complex'}[8]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[8]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[8]{'contents'}[1];
-$result_trees{'complex'}[9]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[9]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'complex'}[9]{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[9]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[9]{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'complex'}[9]{'contents'}[2]{'args'}[3]{'contents'}[0];
 $result_trees{'complex'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[9]{'contents'}[1];
-$result_trees{'complex'}[10]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'complex'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'complex'}[10]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'complex'}[10]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[10]{'contents'}[1];
-$result_trees{'complex'}[11]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[11]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex'}[11]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[11]{'contents'}[1];
-$result_trees{'complex'}[12]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'complex'}[12]{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'complex'}[12]{'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 d525fe7b16..e980af2cdb 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -58,9 +58,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -507,9 +504,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -834,9 +828,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1172,9 +1163,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1260,9 +1248,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1348,9 +1333,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1436,9 +1418,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1524,9 +1503,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1718,9 +1694,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1811,9 +1784,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -1934,9 +1904,6 @@ $result_trees{'complex_split_at_node'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2033,9 +2000,6 @@ $result_trees{'complex_split_at_node'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2148,9 +2112,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2287,9 +2248,6 @@ $result_trees{'complex_split_at_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2452,9 +2410,6 @@ $result_trees{'complex_split_at_node'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -2506,7 +2461,6 @@ $result_trees{'complex_split_at_node'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
@@ -2517,7 +2471,6 @@ 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'content
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1];
-$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
@@ -2525,54 +2478,41 @@ 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'content
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'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]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'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]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'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]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'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]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'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'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'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]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'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]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[11]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[12]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[13]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[3]{'contents'}[0];
diff --git 
a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl 
b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
index d63e1b2fcd..9cc6b5327d 100644
--- a/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
+++ b/tp/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
@@ -51,9 +51,6 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -144,7 +141,6 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_begin_chapter_without_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_begin_chapter_without_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_begin_chapter_without_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_begin_chapter_without_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'contents_at_begin_chapter_without_node'} = '@contents
diff --git a/tp/t/results/moresectioning/contents_at_end_document.pl 
b/tp/t/results/moresectioning/contents_at_end_document.pl
index 6b5997d6a8..47fcc87161 100644
--- a/tp/t/results/moresectioning/contents_at_end_document.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document.pl
@@ -29,9 +29,6 @@ $result_trees{'contents_at_end_document'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -144,7 +141,6 @@ $result_trees{'contents_at_end_document'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_document'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'contents_at_end_document'} = '@node Top
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 91c939c757..55adb6863d 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
@@ -29,9 +29,6 @@ $result_trees{'contents_at_end_document_after_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +284,6 @@ $result_trees{'contents_at_end_document_after_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -322,10 +316,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_document_after_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/contents_in_document.pl 
b/tp/t/results/moresectioning/contents_in_document.pl
index 8e90db1573..256b6a48e9 100644
--- a/tp/t/results/moresectioning/contents_in_document.pl
+++ b/tp/t/results/moresectioning/contents_in_document.pl
@@ -29,9 +29,6 @@ $result_trees{'contents_in_document'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -142,7 +139,6 @@ $result_trees{'contents_in_document'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_document'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_in_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_in_document'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'contents_in_document'} = '@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 b991c970eb..792f1946dd 100644
--- a/tp/t/results/moresectioning/empty_top_node_up.pl
+++ b/tp/t/results/moresectioning/empty_top_node_up.pl
@@ -29,9 +29,6 @@ $result_trees{'empty_top_node_up'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -215,9 +212,6 @@ $result_trees{'empty_top_node_up'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -242,10 +236,8 @@ $result_trees{'empty_top_node_up'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_top_node_up'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'empty_top_node_up'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_top_node_up'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_top_node_up'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'empty_top_node_up'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_top_node_up'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_top_node_up'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_top_node_up'} = '@node Top
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index d760c7748a..189b74da28 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -183,9 +183,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -498,9 +495,6 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -526,14 +520,12 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
   'type' => 'document_root'
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[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];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'equivalent_nodes_defined_linked'} = '@node Top, @asis{chap}
diff --git a/tp/t/results/moresectioning/internal_top_node_up.pl 
b/tp/t/results/moresectioning/internal_top_node_up.pl
index 5b05bf82e4..225aafade1 100644
--- a/tp/t/results/moresectioning/internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/internal_top_node_up.pl
@@ -30,9 +30,6 @@ $result_trees{'internal_top_node_up'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -224,9 +221,6 @@ $result_trees{'internal_top_node_up'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -255,11 +249,9 @@ $result_trees{'internal_top_node_up'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1];
-$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $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 f45e51f3ad..0e73901ab1 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -29,9 +29,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -205,9 +202,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -391,9 +385,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -577,9 +568,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -811,9 +799,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -901,9 +886,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1089,9 +1071,6 @@ $result_trees{'lowered_subsubsection'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1190,25 +1169,18 @@ $result_trees{'lowered_subsubsection'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'lowered_subsubsection'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[11]{'args'}[0]{'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'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
 $result_texis{'lowered_subsubsection'} = '@node Top
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 16a12f7bb5..eddd7b2b73 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -29,9 +29,6 @@ $result_trees{'more_sections_than_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -347,9 +344,6 @@ $result_trees{'more_sections_than_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -500,9 +494,6 @@ $result_trees{'more_sections_than_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -740,9 +731,6 @@ $result_trees{'more_sections_than_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -983,9 +971,6 @@ $result_trees{'more_sections_than_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1089,22 +1074,17 @@ $result_trees{'more_sections_than_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'more_sections_than_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'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'}[10]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[10]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'extra'}{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[2]{'contents'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'extra'}{'nodes_manuals'}[3]{'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 32cb792164..da87c732c5 100644
--- a/tp/t/results/moresectioning/no_element.pl
+++ b/tp/t/results/moresectioning/no_element.pl
@@ -95,9 +95,6 @@ $result_trees{'no_element'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'An-anchor'
           },
           'source_info' => {
@@ -193,9 +190,6 @@ $result_trees{'no_element'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Anchor-in-footnote'
                   },
                   'source_info' => {
@@ -392,9 +386,6 @@ $result_trees{'no_element'} = {
           ],
           'extra' => {
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float-anchor'
           },
           'info' => {
@@ -608,15 +599,12 @@ $result_trees{'no_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[4];
 
$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'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'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];
diff --git a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
index 4ff95ce49b..09ab539970 100644
--- a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -94,9 +94,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -137,9 +134,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -252,9 +246,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -295,9 +286,6 @@ $result_trees{'nodes_before_after_top_xref'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -585,13 +573,9 @@ $result_trees{'nodes_before_after_top_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'nodes_before_after_top_xref'}{'contents'}[1];
 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
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 0e8d7dbc71..756338504e 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
@@ -165,9 +165,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -460,9 +457,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -505,7 +499,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0];
@@ -514,7 +507,6 @@ 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'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]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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 4b61046ba8..4b8aa62fe0 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
@@ -165,9 +165,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -460,9 +457,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -505,7 +499,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0];
@@ -514,7 +507,6 @@ 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'n
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'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]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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 676a288ccb..f343382fef 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
@@ -79,9 +79,6 @@ $result_trees{'non_automatic_top_node_up_url'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -327,9 +324,6 @@ $result_trees{'non_automatic_top_node_up_url'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -370,14 +364,12 @@ $result_trees{'non_automatic_top_node_up_url'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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/only_special_spaces_node.pl 
b/tp/t/results/moresectioning/only_special_spaces_node.pl
index c4cf5f2184..9eb68a9277 100644
--- a/tp/t/results/moresectioning/only_special_spaces_node.pl
+++ b/tp/t/results/moresectioning/only_special_spaces_node.pl
@@ -43,9 +43,6 @@ $result_trees{'only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -120,9 +117,6 @@ $result_trees{'only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -313,9 +307,6 @@ $result_trees{'only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -390,9 +381,6 @@ $result_trees{'only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -473,9 +461,6 @@ $result_trees{'only_special_spaces_node'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -544,15 +529,10 @@ $result_trees{'only_special_spaces_node'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'only_special_spaces_node'}{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'only_special_spaces_node'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[1]{"args"}[0]{"contents"}[0];
-$result_trees{'only_special_spaces_node'}{"contents"}[3]{"extra"}{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[3]{"args"}[0]{"contents"}[0];
 
$result_trees{'only_special_spaces_node'}{"contents"}[3]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[3]{"args"}[0]{"contents"}[0];
-$result_trees{'only_special_spaces_node'}{"contents"}[9]{"extra"}{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[9]{"args"}[0]{"contents"}[0];
 
$result_trees{'only_special_spaces_node'}{"contents"}[9]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[9]{"args"}[0]{"contents"}[0];
-$result_trees{'only_special_spaces_node'}{"contents"}[11]{"extra"}{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[11]{"args"}[0]{"contents"}[0];
 
$result_trees{'only_special_spaces_node'}{"contents"}[11]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[11]{"args"}[0]{"contents"}[0];
-$result_trees{'only_special_spaces_node'}{"contents"}[13]{"extra"}{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[13]{"args"}[0]{"contents"}[0];
 
$result_trees{'only_special_spaces_node'}{"contents"}[13]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'only_special_spaces_node'}{"contents"}[13]{"args"}[0]{"contents"}[0];
 
 $result_texis{'only_special_spaces_node'} = '
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 8e75442d76..608275d7e3 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -22,9 +22,6 @@ $result_trees{'placed_things_before_element'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'An-anchor'
           },
           'source_info' => {
@@ -120,9 +117,6 @@ $result_trees{'placed_things_before_element'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Anchor-in-footnote'
                   },
                   'source_info' => {
@@ -319,9 +313,6 @@ $result_trees{'placed_things_before_element'} = {
           ],
           'extra' => {
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float-anchor'
           },
           'info' => {
@@ -661,15 +652,12 @@ $result_trees{'placed_things_before_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[0];
 
$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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[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];
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index c1e6804860..a199ce7bc8 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -26,9 +26,6 @@ $result_trees{'placed_things_before_node'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'An-anchor'
           },
           'source_info' => {
@@ -124,9 +121,6 @@ $result_trees{'placed_things_before_node'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'Anchor-in-footnote'
                   },
                   'source_info' => {
@@ -323,9 +317,6 @@ $result_trees{'placed_things_before_node'} = {
           ],
           'extra' => {
             'float_type' => '',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float-anchor'
           },
           'info' => {
@@ -560,9 +551,6 @@ $result_trees{'placed_things_before_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -640,9 +628,6 @@ $result_trees{'placed_things_before_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -789,22 +774,17 @@ $result_trees{'placed_things_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'label'};
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[1];
 
$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'}[10]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'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'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[16];
-$result_trees{'placed_things_before_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$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 cf8f0fcd10..06d6e70469 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -60,9 +60,6 @@ $result_trees{'raiselowersections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -279,9 +276,6 @@ $result_trees{'raiselowersections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -795,9 +789,6 @@ $result_trees{'raiselowersections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -983,9 +974,6 @@ $result_trees{'raiselowersections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1171,9 +1159,6 @@ $result_trees{'raiselowersections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1520,9 +1505,6 @@ $result_trees{'raiselowersections'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1623,22 +1605,16 @@ $result_trees{'raiselowersections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'raiselowersections'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'raiselowersections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'raiselowersections'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'raiselowersections'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'raiselowersections'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] 
= $result_trees{'raiselowersections'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'raiselowersections'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0] 
= $result_trees{'raiselowersections'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'raiselowersections'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0] 
= $result_trees{'raiselowersections'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'raiselowersections'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[11]{'args'}[0]{'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 c453f0ed3c..f2197836e0 100644
--- a/tp/t/results/moresectioning/rec_nodes.pl
+++ b/tp/t/results/moresectioning/rec_nodes.pl
@@ -199,9 +199,6 @@ $result_trees{'rec_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,9 +419,6 @@ $result_trees{'rec_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -605,9 +599,6 @@ $result_trees{'rec_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -792,9 +783,6 @@ $result_trees{'rec_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -974,9 +962,6 @@ $result_trees{'rec_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1011,24 +996,19 @@ $result_trees{'rec_nodes'} = {
 };
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[1]{'args'}[0]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[3]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[4]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
index 277300a18e..d96a48db5f 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -45,9 +45,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -457,9 +454,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -643,9 +637,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -723,9 +714,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -909,9 +897,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -989,9 +974,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1223,9 +1205,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1553,9 +1532,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1633,9 +1609,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1713,9 +1686,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1793,9 +1763,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1873,9 +1840,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2059,9 +2023,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2144,9 +2105,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2522,9 +2480,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2852,9 +2807,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2932,9 +2884,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3012,9 +2961,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3092,9 +3038,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3172,9 +3115,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3252,9 +3192,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3438,9 +3375,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3518,9 +3452,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3704,9 +3635,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3784,9 +3712,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3970,9 +3895,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4050,9 +3972,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4236,9 +4155,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4566,9 +4482,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4646,9 +4559,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4726,9 +4636,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4806,9 +4713,6 @@ $result_trees{'section_in_unnumbered_info'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4863,100 +4767,68 @@ $result_trees{'section_in_unnumbered_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_in_unnumbered_info'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[11]{'args'}[0]{'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'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[13]{'args'}[0]{'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'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[19]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[21]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[23]{'args'}[0]{'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'}[25]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[25]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[27]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[27]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[27]{'args'}[0]{'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'}[29]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[29]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[29]{'args'}[0]{'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'}[31]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[31]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[31]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[33]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[35]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[35]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[37]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[39]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[41]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[41]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[41]{'args'}[0]{'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'}[43]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[43]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[43]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[45]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[45]{'args'}[0]{'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'}[47]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[49]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[49]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[49]{'args'}[0]{'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'}[51]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[51]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[51]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[51]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[53]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[53]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[53]{'args'}[0]{'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'}[55]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[55]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[55]{'args'}[0]{'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'}[57]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[57]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[57]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[57]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[59]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[59]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[59]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[59]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[61]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[61]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[61]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[61]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[63]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[63]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[63]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[63]{'args'}[0]{'contents'}[0];
 
 $result_texis{'section_in_unnumbered_info'} = '
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index 637f676517..3311ee73d2 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -45,9 +45,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -457,9 +454,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -643,9 +637,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -723,9 +714,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -909,9 +897,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -989,9 +974,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1223,9 +1205,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1553,9 +1532,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1633,9 +1609,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1713,9 +1686,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1793,9 +1763,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1873,9 +1840,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2059,9 +2023,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2144,9 +2105,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2522,9 +2480,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2852,9 +2807,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2932,9 +2884,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3012,9 +2961,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3092,9 +3038,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3172,9 +3115,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3252,9 +3192,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3438,9 +3375,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3518,9 +3452,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3704,9 +3635,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3784,9 +3712,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3970,9 +3895,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4050,9 +3972,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4236,9 +4155,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4566,9 +4482,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4646,9 +4559,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4726,9 +4636,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4806,9 +4713,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -4863,100 +4767,68 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[11]{'args'}[0]{'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'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[13]{'args'}[0]{'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'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[15]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[15]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[17]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[19]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[19]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[19]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[21]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[21]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[21]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[23]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[23]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[23]{'args'}[0]{'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'}[25]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[25]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[25]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[27]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[27]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[27]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[27]{'args'}[0]{'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'}[29]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[29]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[29]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[29]{'args'}[0]{'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'}[31]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[31]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[31]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[33]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[33]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[35]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[35]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[35]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[37]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[37]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[39]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[39]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[39]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[41]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[41]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[41]{'args'}[0]{'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'}[43]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[43]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[43]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[43]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[45]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[45]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[45]{'args'}[0]{'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'}[47]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[47]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[49]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[49]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[49]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[49]{'args'}[0]{'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'}[51]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[51]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[51]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[51]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[53]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[53]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[53]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[53]{'args'}[0]{'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'}[55]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[55]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[55]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[55]{'args'}[0]{'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'}[57]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[57]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[57]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[57]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[59]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[59]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[59]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[59]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[61]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[61]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[61]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[61]{'args'}[0]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[63]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[63]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[63]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[63]{'args'}[0]{'contents'}[0];
 
 $result_texis{'section_in_unnumbered_plaintext'} = '
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index a52e9a7556..8032d55aa9 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -43,9 +43,6 @@ $result_trees{'special_spaces_in_nodes'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -120,9 +117,6 @@ $result_trees{'special_spaces_in_nodes'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -638,9 +632,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -686,9 +677,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -734,9 +722,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -782,9 +767,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -830,9 +812,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -878,9 +857,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -926,9 +902,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -1013,9 +986,6 @@ $result_trees{'special_spaces_in_nodes'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -1049,9 +1019,7 @@ $result_trees{'special_spaces_in_nodes'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'special_spaces_in_nodes'}{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[1]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[3]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[3]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[3]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[3]{"args"}[0]{"contents"}[0];
 
$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];
@@ -1061,23 +1029,15 @@ 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents
 
$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"}[5]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[5]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[5]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[5]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[6]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[6]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[6]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[6]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[7]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[7]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[7]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[7]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[8]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[8]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[8]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[8]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[9]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[9]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[9]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[9]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[10]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[10]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[10]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[10]{"args"}[0]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[11]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[11]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[11]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[11]{"args"}[0]{"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];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"extra"}{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"args"}[0]{"contents"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"args"}[0]{"contents"}[0];
 
 $result_texis{'special_spaces_in_nodes'} = '
diff --git a/tp/t/results/moresectioning/top_node_up_url.pl 
b/tp/t/results/moresectioning/top_node_up_url.pl
index cd783eebd3..bc018cf774 100644
--- a/tp/t/results/moresectioning/top_node_up_url.pl
+++ b/tp/t/results/moresectioning/top_node_up_url.pl
@@ -30,9 +30,6 @@ $result_trees{'top_node_up_url'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -224,9 +221,6 @@ $result_trees{'top_node_up_url'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -255,11 +249,9 @@ $result_trees{'top_node_up_url'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'top_node_up_url'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'top_node_up_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'top_node_up_url'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[1];
-$result_trees{'top_node_up_url'}[1]{'contents'}[0]{'extra'}{'node_content'}[0] 
= $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $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 f6b3906ab0..9225a95f03 100644
--- a/tp/t/results/moresectioning/topic_guide.pl
+++ b/tp/t/results/moresectioning/topic_guide.pl
@@ -50,9 +50,6 @@ $result_trees{'topic_guide'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,9 +299,6 @@ $result_trees{'topic_guide'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -755,9 +749,6 @@ $result_trees{'topic_guide'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -974,9 +965,6 @@ $result_trees{'topic_guide'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1151,9 +1139,6 @@ $result_trees{'topic_guide'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1352,9 +1337,6 @@ $result_trees{'topic_guide'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1608,9 +1590,6 @@ $result_trees{'topic_guide'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1658,9 +1637,6 @@ $result_trees{'topic_guide'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1900,37 +1876,29 @@ $result_trees{'topic_guide'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'topic_guide'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[3]{'args'}[0]{'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'}[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]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[5]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[5]{'args'}[1]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[6]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[6]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[7]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[8]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[8]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[9]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[9]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[10]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'topic_guide'}{'contents'}[10]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'topic_guide'}{'contents'}[10]{'args'}[0]{'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];
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 9c620db1f3..0d75815bc0 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -821,9 +821,6 @@ $result_trees{'commands_in_flushright'} = {
               'extra' => {
                 'caption' => {},
                 'float_type' => 'label',
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'type'
               },
               'info' => {
@@ -1174,7 +1171,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'columnfractions'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'caption'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[3];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'args'}[1]{'contents'}[0];
 
 $result_texis{'commands_in_flushright'} = '@flushright
 
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index d905708ddf..7726e9ea8c 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -72,9 +72,6 @@ $result_trees{'all_spaces'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -447,9 +444,6 @@ $result_trees{'all_spaces'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -474,9 +468,7 @@ $result_trees{'all_spaces'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'all_spaces'}{"contents"}[1]{"extra"}{"node_content"}[0] = 
$result_trees{'all_spaces'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'all_spaces'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = $result_trees{'all_spaces'}{"contents"}[1]{"args"}[0]{"contents"}[0];
-$result_trees{'all_spaces'}{"contents"}[2]{"extra"}{"node_content"}[0] = 
$result_trees{'all_spaces'}{"contents"}[2]{"args"}[0]{"contents"}[0];
 
$result_trees{'all_spaces'}{"contents"}[2]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = $result_trees{'all_spaces'}{"contents"}[2]{"args"}[0]{"contents"}[0];
 
 $result_texis{'all_spaces'} = '@documentencoding utf-8
diff --git a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl 
b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
index 1e6b4ccc53..0d2a3c9bdd 100644
--- a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
+++ b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
@@ -36,9 +36,6 @@ $result_trees{'anchor_and_empty_lines'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'in-anchor'
           },
           'source_info' => {
@@ -72,7 +69,6 @@ $result_trees{'anchor_and_empty_lines'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_and_empty_lines'} = 'text 1.
 
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index 91dac2c9cf..d65b8cd694 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -366,9 +366,6 @@ $result_trees{'at_commands_glued_in_example'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'anchor'
                   },
                   'source_info' => {
@@ -471,7 +468,6 @@ $result_trees{'at_commands_glued_in_example'} = {
   'type' => 'document_root'
 };
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[37]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40];
 
 $result_texis{'at_commands_glued_in_example'} = '@example
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index 7700941b87..ff62596f9f 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -357,9 +357,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'anchor'
               },
               'source_info' => {
@@ -423,7 +420,6 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
   'type' => 'document_root'
 };
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[3];
 
 $result_texis{'at_commands_glued_in_paragraph'} = 'at@@.
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index ae7b7988b3..a48d5cf0a6 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -114,9 +114,6 @@ $result_trees{'chinese_mixed_with_en'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -208,9 +205,6 @@ $result_trees{'chinese_mixed_with_en'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -435,9 +429,7 @@ $result_trees{'chinese_mixed_with_en'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'chinese_mixed_with_en'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chinese_mixed_with_en'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'chinese_mixed_with_en'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chinese_mixed_with_en'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'chinese_mixed_with_en'} = '\\input texinfo
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 94275f056f..155151e68b 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -188,9 +188,6 @@ $result_trees{'japanese_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -600,9 +597,6 @@ $result_trees{'japanese_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -699,9 +693,6 @@ $result_trees{'japanese_utf8'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -787,13 +778,10 @@ $result_trees{'japanese_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'japanese_utf8'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'japanese_utf8'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'japanese_utf8'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'japanese_utf8'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'japanese_utf8'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'japanese_utf8'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'japanese_utf8'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'japanese_utf8'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'japanese_utf8'} = '\\input texinfo @c -*- coding: utf-8; mode: 
texinfo; -*-
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 e636fadadb..36dbd14b47 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -2210,9 +2210,6 @@ $result_trees{'line_passed_and_formats'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2239,7 +2236,6 @@ $result_trees{'line_passed_and_formats'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'line_passed_and_formats'} = '@node Top
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index 8eecdbc28c..2056b158bc 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -95,9 +95,6 @@ $result_trees{'non_break_spaces'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -122,7 +119,6 @@ $result_trees{'non_break_spaces'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_break_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'non_break_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'non_break_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'non_break_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'non_break_spaces'} = '@documentencoding utf-8
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
index a98dbe8935..6014bcacd3 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
@@ -50,9 +50,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1153,9 +1147,7 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_ascii_glyph'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
index 30b5b03f59..7836d022ea 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_ascii_glyph_latin1'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
index 3316fdc932..786972632a 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
@@ -90,9 +90,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_ascii_glyph_usascii'} = '\\input texinfo
diff --git a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
index e888c88722..3e49a42223 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -50,9 +50,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'punctuation_sc_accents_default'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1153,9 +1147,7 @@ $result_trees{'punctuation_sc_accents_default'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_default'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_default'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_default'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_default'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_default'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
index a8709066b9..694f4b815e 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_default_latin1'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
index 64dc6a519b..e13f0ff994 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
@@ -90,9 +90,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_default_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_default_usascii'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
index 4da842061e..3c6940e988 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
@@ -50,9 +50,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -130,9 +127,6 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1153,9 +1147,7 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_disable_encoding'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
index 2f3cd6f876..e6fb33d03c 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
@@ -90,9 +90,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_disable_encoding_latin1'} = '\\input 
texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
index 8e41e2880b..e641cc2cbe 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
@@ -90,9 +90,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_disable_encoding_usascii'} = '\\input 
texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
index 40fe055af5..a5d98d616d 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
@@ -90,9 +90,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = '\\input 
texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
index dd1726a719..aeec572281 100644
--- 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
+++ 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
@@ -90,9 +90,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = '\\input 
texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
index 5958435876..49ddadd2ab 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
@@ -90,9 +90,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1193,9 +1187,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_latin1'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_to_utf8_latin1'} = '\\input texinfo
diff --git 
a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl 
b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
index 22b18f1dba..e70811daef 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
@@ -90,9 +90,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -170,9 +167,6 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1214,9 +1208,7 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'punctuation_sc_accents_to_utf8_usascii'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'punctuation_sc_accents_to_utf8_usascii'} = '\\input texinfo
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index d689dfed91..87b5ffd0ad 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -35,9 +35,6 @@ $result_trees{'quote_node_names'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -221,9 +218,6 @@ $result_trees{'quote_node_names'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -392,9 +386,6 @@ $result_trees{'quote_node_names'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -532,9 +523,6 @@ $result_trees{'quote_node_names'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -730,9 +718,6 @@ $result_trees{'quote_node_names'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -1986,9 +1971,6 @@ $result_trees{'quote_node_names'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2013,9 +1995,7 @@ $result_trees{'quote_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quote_node_names'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[1];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[1]{'manual_content'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'args'}[1]{'contents'}[2];
@@ -2030,19 +2010,16 @@ 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'label'};
@@ -2068,7 +2045,6 @@ $result_trees{'quote_node_names'}{'contents'}[3] = 
$result_trees{'quote_node_nam
 $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'};
 $result_trees{'quote_node_names'}{'contents'}[9] = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
-$result_trees{'quote_node_names'}{'contents'}[11]{'extra'}{'node_content'}[0] 
= $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
 $result_texis{'quote_node_names'} = '@node Top
diff --git a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
index 9fbe9fabbc..8a77dbb2cc 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -83,9 +83,6 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'an-anchor'
                   },
                   'source_info' => {
@@ -202,7 +199,6 @@ $result_trees{'example_invalid_at_commands_arguments'} = {
   'type' => 'document_root'
 };
 
$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'example_invalid_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
 $result_texis{'example_invalid_at_commands_arguments'} = '@example 
@ref{a,b,c,d} fa, @anchor{an anchor} on example line, @center in center
 @end example
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index e1a0fa140f..d406afc422 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -62,9 +62,6 @@ $result_trees{'anchor_in_copying'} = {
                       ],
                       'cmdname' => 'anchor',
                       'extra' => {
-                        'node_content' => [
-                          {}
-                        ],
                         'normalized' => 'Copying-information'
                       },
                       'source_info' => {
@@ -162,9 +159,6 @@ $result_trees{'anchor_in_copying'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -293,9 +287,6 @@ $result_trees{'anchor_in_copying'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -320,12 +311,9 @@ $result_trees{'anchor_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'anchor_in_copying'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_in_copying'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying'} = '
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index dab5f1f800..1c85d42921 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -61,9 +61,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                                   ],
                                   'cmdname' => 'anchor',
                                   'extra' => {
-                                    'node_content' => [
-                                      {}
-                                    ],
                                     'normalized' => 'Copying-footnote'
                                   },
                                   'source_info' => {
@@ -185,9 +182,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -316,9 +310,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -343,12 +334,9 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying_in_footnote'} = '@copying
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 897acaefdb..153149d48e 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -46,9 +46,6 @@ $result_trees{'anchor_in_titlepage'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-titlepage'
                   },
                   'source_info' => {
@@ -167,9 +164,6 @@ $result_trees{'anchor_in_titlepage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -283,9 +277,6 @@ $result_trees{'anchor_in_titlepage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -310,12 +301,9 @@ $result_trees{'anchor_in_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_titlepage'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_titlepage'} = '@titlepage
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index cce02c2420..b31047759e 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -46,9 +46,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   ],
                   'cmdname' => 'anchor',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'normalized' => 'in-titlepage'
                   },
                   'source_info' => {
@@ -167,9 +164,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -283,9 +277,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -310,12 +301,9 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_titlepage_titlepage'} = '@titlepage
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 7eeeaf09a4..b2f655b517 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -166,9 +166,6 @@ $result_trees{'format_in_titlepage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -216,9 +213,6 @@ $result_trees{'format_in_titlepage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -243,9 +237,7 @@ $result_trees{'format_in_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'format_in_titlepage'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'format_in_titlepage'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'format_in_titlepage'} = '@titlepage
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 50e593efa4..2829eea452 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -166,9 +166,6 @@ $result_trees{'format_in_titlepage_titlepage'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -216,9 +213,6 @@ $result_trees{'format_in_titlepage_titlepage'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -243,9 +237,7 @@ $result_trees{'format_in_titlepage_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'format_in_titlepage_titlepage'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'format_in_titlepage_titlepage'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'format_in_titlepage_titlepage'} = '@titlepage
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index a10e03152b..793d31632c 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -59,9 +59,6 @@ $result_trees{'ref_in_copying'} = {
                           ],
                           'cmdname' => 'node',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'nodes_manuals' => [
                               {
                                 'node_content' => [
@@ -172,9 +169,6 @@ $result_trees{'ref_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -400,10 +394,8 @@ $result_trees{'ref_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$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'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_in_copying'}{'contents'}[1]{'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'}[3] = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'};
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 e105b0f108..be0bd08337 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
@@ -59,9 +59,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                           ],
                           'cmdname' => 'node',
                           'extra' => {
-                            'node_content' => [
-                              {}
-                            ],
                             'nodes_manuals' => [
                               {
                                 'node_content' => [
@@ -172,9 +169,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -252,9 +246,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -480,12 +471,9 @@ $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'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[3]{'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'}[5] = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'label'};
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 085fe5f3b4..60369c73a3 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -116,9 +116,6 @@ $result_trees{'today_in_copying'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -218,9 +215,6 @@ $result_trees{'today_in_copying'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -245,9 +239,7 @@ $result_trees{'today_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'today_in_copying'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'today_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'today_in_copying'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'today_in_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'today_in_copying'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'today_in_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'today_in_copying'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'today_in_copying'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'today_in_copying'} = '@copying
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index 1ba591faf0..79eeb01b34 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -69,9 +69,6 @@ $result_trees{'a_comma_after_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -108,7 +105,6 @@ $result_trees{'a_comma_after_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'a_comma_after_node'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'a_comma_after_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'a_comma_after_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'a_comma_after_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2]{'contents'}[0];
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index 8a5ddb6af7..9f3ec1accb 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -47,9 +47,6 @@ $result_trees{'anchor_zero'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => '0'
           },
           'source_info' => {
@@ -110,9 +107,6 @@ $result_trees{'anchor_zero'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -137,10 +131,8 @@ $result_trees{'anchor_zero'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'anchor_zero'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'anchor_zero'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'anchor_zero'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'anchor_zero'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'anchor_zero'} = '@node Top
diff --git a/tp/t/results/sectioning/at_commands_in_node.pl 
b/tp/t/results/sectioning/at_commands_in_node.pl
index e9e50cd105..ecf73acfd0 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -202,22 +202,6 @@ $result_trees{'at_commands_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -255,20 +239,6 @@ $result_trees{'at_commands_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[13];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'at_commands_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
index a083ef787f..2073e6b000 100644
--- a/tp/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -29,9 +29,6 @@ $result_trees{'automatic_menu_referencing_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'automatic_menu_referencing_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -189,9 +183,6 @@ $result_trees{'automatic_menu_referencing_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -246,11 +237,8 @@ $result_trees{'automatic_menu_referencing_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'automatic_menu_referencing_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'automatic_menu_referencing_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'automatic_menu_referencing_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'automatic_menu_referencing_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'automatic_menu_referencing_node'} = '@node Top
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 9626542e6a..be09caa905 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -35,9 +35,6 @@ $result_trees{'chapter_between_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -294,9 +291,6 @@ $result_trees{'chapter_between_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -395,10 +389,8 @@ $result_trees{'chapter_between_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
 
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 2ef08fab51..7c65d0a2ec 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
@@ -29,9 +29,6 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -253,9 +250,6 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -310,10 +304,8 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_with_appendix'} = '@node Top
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 dfc96889d1..42fca6c399 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
@@ -29,9 +29,6 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -253,9 +250,6 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -310,10 +304,8 @@ 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_with_appendix_nomenu'} = '@node Top
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 816148e4ca..4c1e43b387 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
@@ -36,9 +36,6 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -259,9 +256,6 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -340,10 +334,8 @@ $result_trees{'chapter_node_before_and_after_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_node_before_and_after_part'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[4]{'args'}[0]{'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];
 
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index d22001829f..d755bdd576 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -36,9 +36,6 @@ $result_trees{'character_and_spaces_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -116,9 +113,6 @@ $result_trees{'character_and_spaces_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -214,9 +208,6 @@ $result_trees{'character_and_spaces_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -302,9 +293,6 @@ $result_trees{'character_and_spaces_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -382,9 +370,6 @@ $result_trees{'character_and_spaces_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -422,24 +407,19 @@ $result_trees{'character_and_spaces_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'character_and_spaces_in_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/contents_and_parts.pl 
b/tp/t/results/sectioning/contents_and_parts.pl
index fb6d3dc261..a78286e1dc 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -35,9 +35,6 @@ $result_trees{'contents_and_parts'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -354,9 +351,6 @@ $result_trees{'contents_and_parts'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -436,9 +430,6 @@ $result_trees{'contents_and_parts'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -553,9 +544,6 @@ $result_trees{'contents_and_parts'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -649,17 +637,13 @@ $result_trees{'contents_and_parts'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_and_parts'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'contents_and_parts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_and_parts'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'contents_and_parts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[4]{'extra'}{'node_content'}[0] 
= $result_trees{'contents_and_parts'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_and_parts'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'contents_and_parts'}{'contents'}[4]{'args'}[0]{'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'}[6]{'extra'}{'node_content'}[0] 
= $result_trees{'contents_and_parts'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_and_parts'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'contents_and_parts'}{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'contents_and_parts'}{'contents'}[9]{'extra'}{'node_content'}[0] 
= $result_trees{'contents_and_parts'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_and_parts'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'contents_and_parts'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_and_parts'}{'contents'}[10]{'extra'}{'associated_part'} 
= $result_trees{'contents_and_parts'}{'contents'}[8];
 
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 6f9c545822..60a97ed020 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -67,9 +67,6 @@ $result_trees{'contents_with_only_top_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -94,7 +91,6 @@ $result_trees{'contents_with_only_top_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_with_only_top_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'contents_with_only_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'contents_with_only_top_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'contents_with_only_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'contents_with_only_top_node'} = '
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index dc268b9d6f..fd1b5a5f45 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -36,9 +36,6 @@ $result_trees{'double_node_anchor_float'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -126,9 +123,6 @@ $result_trees{'double_node_anchor_float'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'anchor1'
           },
           'source_info' => {
@@ -422,9 +416,6 @@ $result_trees{'double_node_anchor_float'} = {
           ],
           'extra' => {
             'float_type' => 'Text',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'float1'
           },
           'info' => {
@@ -507,11 +498,8 @@ $result_trees{'double_node_anchor_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_node_anchor_float'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index cb522bcf02..8618c3b7cf 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -36,9 +36,6 @@ $result_trees{'double_part'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -331,9 +328,6 @@ $result_trees{'double_part'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -402,14 +396,12 @@ $result_trees{'double_part'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'double_part'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'double_part'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_part'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_part'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'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];
 $result_trees{'double_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
-$result_trees{'double_part'}[2]{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'double_part'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_part'}[2]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_part'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'double_part'}[2]{'contents'}[2]{'extra'}{'associated_part'} = 
$result_trees{'double_part'}[2]{'contents'}[0];
 $result_trees{'double_part'}[2]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[2];
diff --git 
a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl 
b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
index cf6582c3fd..77a8f219c1 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_node_reference.pl
@@ -35,9 +35,6 @@ $result_trees{'double_recursive_self_section_node_reference'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -202,10 +196,6 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {},
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -275,14 +265,10 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'extra'}{'label'}
 = $result_trees{'double_recursive_self_section_node_reference'}{'contents'}[3];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[1]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[1];
 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/sectioning/double_recursive_self_section_reference.pl 
b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
index f6174f0e87..7b67956d99 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -35,9 +35,6 @@ $result_trees{'double_recursive_self_section_reference'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -95,9 +92,6 @@ $result_trees{'double_recursive_self_section_reference'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -220,9 +214,7 @@ $result_trees{'double_recursive_self_section_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'double_recursive_self_section_reference'}{'contents'}[3] = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'};
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index 11279307f6..86e0800a7f 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -47,9 +47,6 @@ $result_trees{'double_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -186,7 +183,6 @@ $result_trees{'double_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_top'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'double_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'double_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'double_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 1933bc226f..bced7af200 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -210,9 +210,6 @@ $result_trees{'double_top_in_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -327,7 +324,6 @@ $result_trees{'double_top_in_menu'} = {
 };
 
$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]{'extra'}{'node_content'}[0] 
= $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'double_top_in_menu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index 8a8f30c079..8d94723c1a 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -125,13 +125,6 @@ $result_trees{'email_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -160,11 +153,6 @@ $result_trees{'email_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[1] = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[2] = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[3] = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[4] = 
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index 2c7b427723..5c78c72dd9 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -319,9 +319,6 @@ $result_trees{'empty_ref_arg'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -354,7 +351,6 @@ 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'ext
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'label'}
 = $result_trees{'empty_ref_arg'}{'contents'}[1];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'empty_ref_arg'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'empty_ref_arg'} = '@node first
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index 05c9d37e9e..e35e21600d 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -62,9 +62,6 @@ $result_trees{'equivalent_labels'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'anch'
           },
           'source_info' => {
@@ -161,9 +158,6 @@ $result_trees{'equivalent_labels'} = {
           ],
           'extra' => {
             'float_type' => 'truc',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'floa'
           },
           'info' => {
@@ -348,9 +342,6 @@ $result_trees{'equivalent_labels'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -375,11 +366,8 @@ $result_trees{'equivalent_labels'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[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]{'extra'}{'node_content'}[0] 
= $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 b7701d36ce..7c505fde21 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -183,9 +183,6 @@ $result_trees{'equivalent_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -290,9 +287,6 @@ $result_trees{'equivalent_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -318,12 +312,10 @@ $result_trees{'equivalent_nodes'} = {
   'type' => 'document_root'
 };
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[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];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'equivalent_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'equivalent_nodes'} = '@node first, @emph{node}
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 39326ca8f2..2fc4252138 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -195,9 +195,6 @@ $result_trees{'explicit_node_directions'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -296,9 +293,6 @@ $result_trees{'explicit_node_directions'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -384,9 +378,6 @@ $result_trees{'explicit_node_directions'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -430,16 +421,13 @@ $result_trees{'explicit_node_directions'} = [
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'args'}[0]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[1]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[3]{'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 bb47922eca..6c6b9714cd 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -29,9 +29,6 @@ $result_trees{'external_node_in_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -323,9 +320,6 @@ $result_trees{'external_node_in_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -403,9 +397,6 @@ $result_trees{'external_node_in_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -460,15 +451,12 @@ $result_trees{'external_node_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'external_node_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'external_node_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'external_node_in_menu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'external_node_in_menu'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'external_node_in_menu'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'external_node_in_menu'} = '@node Top
diff --git a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index abb5dd7a2a..564d30f519 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -34,9 +34,6 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -335,7 +332,6 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_ascii_spaces_node'}{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_ascii_spaces_node'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_ascii_spaces_node'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_ascii_spaces_node'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_ascii_spaces_node'} = '@node Top
diff --git 
a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
index 9c8ec4130f..ff01db17e3 100644
--- a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -34,9 +34,6 @@ $result_trees{'in_menu_only_special_ascii_spaces_node_menu'} 
= {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -335,7 +332,6 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_ascii_spaces_node_menu'} = '@node 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 d8f7800782..5452b91a96 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
@@ -43,9 +43,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -435,9 +432,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -628,9 +622,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -705,9 +696,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -788,9 +776,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -859,19 +844,14 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$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"}[3]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[3]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[3]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[3]{"args"}[0]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[9]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[9]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[9]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[9]{"args"}[0]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[11]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[11]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[11]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[11]{"args"}[0]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[13]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[13]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[13]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[13]{"args"}[0]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_spaces_node'} = '
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 ab5d5ee15c..711cf5c3ee 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
@@ -43,9 +43,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -435,9 +432,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -628,9 +622,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -705,9 +696,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       ],
       "cmdname" => "node",
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -788,9 +776,6 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
         }
       ],
       "extra" => {
-        "node_content" => [
-          {}
-        ],
         "nodes_manuals" => [
           {
             "node_content" => [
@@ -859,19 +844,14 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[1]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[1]{"args"}[0]{"contents"}[0];
 
$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"}[3]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[3]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[3]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[3]{"args"}[0]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[9]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[9]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[9]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[9]{"args"}[0]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[11]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[11]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[11]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[11]{"args"}[0]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[13]{"extra"}{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[13]{"args"}[0]{"contents"}[0];
 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[13]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[13]{"args"}[0]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_spaces_node_menu'} = '
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index f99d219421..52665b1a90 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -149,9 +149,6 @@ $result_trees{'lone_Top_node'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -192,9 +189,6 @@ $result_trees{'lone_Top_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -254,9 +248,7 @@ $result_trees{'lone_Top_node'} = [
   }
 ];
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'lone_Top_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'lone_Top_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'lone_Top_node'}[0]{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'lone_Top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'lone_Top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'lone_Top_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
 
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index d7ea2cb78a..b9517c4c70 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -35,9 +35,6 @@ $result_trees{'loop_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -348,9 +345,6 @@ $result_trees{'loop_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -526,9 +520,6 @@ $result_trees{'loop_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -577,9 +568,6 @@ $result_trees{'loop_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -604,18 +592,14 @@ $result_trees{'loop_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'loop_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[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]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[3]{'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]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'loop_nodes'} = '@node Top
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 82a5b81917..e73b483e9a 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -185,9 +185,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -371,9 +368,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -451,9 +445,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -536,9 +527,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -818,9 +806,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -898,9 +883,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -978,9 +960,6 @@ $result_trees{'menutextorder'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1037,23 +1016,16 @@ $result_trees{'menutextorder'} = {
 };
 
$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'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[1]{'args'}[0]{'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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[7]{'args'}[0]{'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'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[11]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[13]{'extra'}{'node_content'}[0] = 
$result_trees{'menutextorder'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[13]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menutextorder'}{'contents'}[13]{'args'}[0]{'contents'}[0];
 
 $result_texis{'menutextorder'} = '@menu
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index 12422a4d2b..96b66e9199 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -29,9 +29,6 @@ $result_trees{'next_in_menu_is_below'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -215,9 +212,6 @@ $result_trees{'next_in_menu_is_below'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -449,9 +443,6 @@ $result_trees{'next_in_menu_is_below'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -635,9 +626,6 @@ $result_trees{'next_in_menu_is_below'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -692,17 +680,13 @@ $result_trees{'next_in_menu_is_below'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'next_in_menu_is_below'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[5]{'args'}[0]{'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'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
 $result_texis{'next_in_menu_is_below'} = '@node 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 ab8e6d8b18..58818efa55 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -190,9 +190,6 @@ $result_trees{'next_no_prev_to_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -267,9 +264,6 @@ $result_trees{'next_no_prev_to_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -340,9 +334,6 @@ $result_trees{'next_no_prev_to_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -377,13 +368,10 @@ $result_trees{'next_no_prev_to_node'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[3]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index edb43791ca..86e8d9d35d 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -29,9 +29,6 @@ $result_trees{'no_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -99,9 +96,6 @@ $result_trees{'no_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -179,9 +173,6 @@ $result_trees{'no_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -259,9 +250,6 @@ $result_trees{'no_menu'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -316,13 +304,9 @@ $result_trees{'no_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'no_menu'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'no_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_menu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_menu'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'no_menu'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'no_menu'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_menu'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_menu'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'no_menu'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'no_menu'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_menu'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_menu'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
 $result_texis{'no_menu'} = '@node Top
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index 5ab66ae51b..266814ec20 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -31,9 +31,6 @@ $result_trees{'node_empty_direction'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -59,7 +56,6 @@ $result_trees{'node_empty_direction'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_empty_direction'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_empty_direction'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'node_empty_direction'} = '@node name, ';
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index f425bcb13a..83c89b263f 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -36,9 +36,6 @@ $result_trees{'node_line_arguments'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -90,9 +87,6 @@ $result_trees{'node_line_arguments'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -163,9 +157,6 @@ $result_trees{'node_line_arguments'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -255,9 +246,6 @@ $result_trees{'node_line_arguments'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -360,9 +348,6 @@ $result_trees{'node_line_arguments'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -443,9 +428,6 @@ $result_trees{'node_line_arguments'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -574,11 +556,6 @@ $result_trees{'node_line_arguments'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {},
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -618,30 +595,21 @@ $result_trees{'node_line_arguments'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_line_arguments'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[1]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[2]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[5]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[7]{'extra'}{'node_content'}[1]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'node_line_arguments'}{'contents'}[7]{'extra'}{'node_content'}[2]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'node_line_arguments'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_line_arguments'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'node_line_arguments'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[2]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[0]{'contents'}[2];
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index e111cd80c6..16de63dfc9 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -351,9 +351,6 @@ $result_trees{'node_nested_parentheses'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -386,7 +383,6 @@ 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $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 bc46f533c2..640bdda504 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -30,9 +30,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -279,9 +276,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -367,9 +361,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -489,15 +480,12 @@ $result_trees{'node_part_chapter_after_chapter'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
-$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $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'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[1];
 $result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
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 5c709c4fb0..c95b4e71da 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -30,9 +30,6 @@ $result_trees{'node_part_chapter_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -224,9 +221,6 @@ $result_trees{'node_part_chapter_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -324,11 +318,9 @@ $result_trees{'node_part_chapter_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
-$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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 94c5b6caf0..b7b2fd6714 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -174,9 +174,6 @@ $result_trees{'node_referenced_in_ref'} = {
                   ],
                   'cmdname' => 'node',
                   'extra' => {
-                    'node_content' => [
-                      {}
-                    ],
                     'nodes_manuals' => [
                       {
                         'node_content' => [
@@ -225,9 +222,6 @@ $result_trees{'node_referenced_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -275,9 +269,6 @@ $result_trees{'node_referenced_in_ref'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -304,12 +295,9 @@ $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'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'label'}{'args'}[0]{'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'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_referenced_in_ref'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[2]{'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_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index f8e7e9914f..19cbfa415d 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -35,9 +35,6 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -128,7 +125,6 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_chapter_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'node_sectop_before_chapter_no_node'} = '@node Top
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 564fc0cd97..f3f509bc03 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -35,9 +35,6 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -150,9 +147,6 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -193,9 +187,6 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -266,11 +257,8 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_sectop_before_lone_node_Top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'node_sectop_before_lone_node_Top'} = '@node node before
diff --git a/tp/t/results/sectioning/node_simple.pl 
b/tp/t/results/sectioning/node_simple.pl
index 4e01725c74..cb8fe8c84a 100644
--- a/tp/t/results/sectioning/node_simple.pl
+++ b/tp/t/results/sectioning/node_simple.pl
@@ -23,9 +23,6 @@ $result_trees{'node_simple'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -50,7 +47,6 @@ $result_trees{'node_simple'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_simple'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'node_simple'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_simple'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_simple'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'node_simple'} = '@node first';
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index 914957bbc7..0280ab7b22 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -58,9 +58,6 @@ $result_trees{'node_too_much_args'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -92,7 +89,6 @@ $result_trees{'node_too_much_args'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index de05d2adc5..ccea676704 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -52,9 +52,6 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -90,7 +87,6 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'args'}[3]{'contents'}[3];
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index f7a5fdf5b2..4289a9a8e2 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -149,9 +149,6 @@ $result_trees{'node_up_external_node'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -258,9 +255,6 @@ $result_trees{'node_up_external_node'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -305,10 +299,8 @@ $result_trees{'node_up_external_node'} = [
   }
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'args'}[0]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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 d9b66298a2..a323a3981b 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -29,9 +29,6 @@ $result_trees{'nodename_parentheses'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -323,9 +320,6 @@ $result_trees{'nodename_parentheses'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -417,9 +411,6 @@ $result_trees{'nodename_parentheses'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -604,9 +595,6 @@ $result_trees{'nodename_parentheses'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'manual_content' => [
@@ -618,7 +606,7 @@ $result_trees{'nodename_parentheses'} = {
             'normalized' => 'node'
           }
         ],
-        'normalized' => 'node'
+        'normalized' => '_0028manual_0029node'
       },
       'info' => {
         'spaces_before_argument' => {
@@ -691,10 +679,7 @@ $result_trees{'nodename_parentheses'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {}
-            ],
-            'normalized' => 'anchor'
+            'normalized' => '_0028manual_0029anchor'
           },
           'source_info' => {
             'file_name' => '',
@@ -732,24 +717,19 @@ $result_trees{'nodename_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodename_parentheses'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$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];
 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'nodename_parentheses'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[7]{'args'}[0]{'contents'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'manual_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[7]{'args'}[0]{'contents'}[1];
 
$result_trees{'nodename_parentheses'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[7]{'args'}[0]{'contents'}[3];
-$result_trees{'nodename_parentheses'}{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[3];
 
 $result_texis{'nodename_parentheses'} = '@node Top
 @top The top node
@@ -877,7 +857,7 @@ $result_sectioning{'nodename_parentheses'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 'node'
+                    'normalized' => '_0028manual_0029node'
                   },
                   'info' => {},
                   'structure' => {}
@@ -974,7 +954,7 @@ $result_nodes{'nodename_parentheses'} = {
                     'section_number' => 3
                   }
                 },
-                'normalized' => 'node'
+                'normalized' => '_0028manual_0029node'
               },
               'info' => {},
               'structure' => {
@@ -1071,12 +1051,12 @@ $result_errors{'nodename_parentheses'} = [
     'type' => 'error'
   },
   {
-    'error_line' => 'warning: node `Top\' lacks menu item for `node\' despite 
being its Up target
+    'error_line' => 'warning: node `Top\' lacks menu item for `(manual)node\' 
despite being its Up target
 ',
     'file_name' => '',
     'line_nr' => 1,
     'macro' => '',
-    'text' => 'node `Top\' lacks menu item for `node\' despite being its Up 
target',
+    'text' => 'node `Top\' lacks menu item for `(manual)node\' despite being 
its Up target',
     'type' => 'warning'
   }
 ];
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 5eced3297f..56abd83940 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
@@ -195,9 +195,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -296,9 +293,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -384,9 +378,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -460,16 +451,13 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'args'}[0]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[3]{'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 83750a6fcd..6c1b2d9614 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
@@ -200,9 +200,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -293,9 +290,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -373,9 +367,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -445,14 +436,11 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'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 ce7bdcfd84..eb44a3b315 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
@@ -200,9 +200,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -293,9 +290,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -373,9 +367,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -445,14 +436,11 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 };
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'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 2861a402cf..54d17b59af 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
@@ -195,9 +195,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -288,9 +285,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -368,9 +362,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -444,14 +435,11 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'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 1b4fb5bc15..f8792eb5f1 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
@@ -194,9 +194,6 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +284,6 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -367,9 +361,6 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -439,14 +430,11 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'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 c3fb6b79a2..939afae307 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
@@ -194,9 +194,6 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +284,6 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -367,9 +361,6 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -439,14 +430,11 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'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 038593794b..168837f16b 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
@@ -195,9 +195,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -296,9 +293,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -384,9 +378,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -460,16 +451,13 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'args'}[0]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[3]{'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 d15f05b020..542f467645 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
@@ -195,9 +195,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -288,9 +285,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -368,9 +362,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -444,14 +435,11 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'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 eab60486dd..b05c8e7897 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
@@ -194,9 +194,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +284,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -367,9 +361,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -439,14 +430,11 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'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 bf5e43152c..37777319d1 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
@@ -194,9 +194,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +284,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -367,9 +361,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -439,14 +430,11 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'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 2dbcc3c8d7..5a9ceb2c34 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
@@ -194,9 +194,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -287,9 +284,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -367,9 +361,6 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -439,14 +430,11 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 74deabb00f..3f8b377e98 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -56,9 +56,6 @@ $result_trees{'nodes_before_after_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -99,9 +96,6 @@ $result_trees{'nodes_before_after_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -214,9 +208,6 @@ $result_trees{'nodes_before_after_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -257,9 +248,6 @@ $result_trees{'nodes_before_after_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -330,13 +318,9 @@ $result_trees{'nodes_before_after_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_after_top'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_before_after_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'nodes_before_after_top'} = '@node node before
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index 4cf15ee1b4..11ac46e915 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -183,9 +183,6 @@ $result_trees{'nodes_before_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -259,9 +256,6 @@ $result_trees{'nodes_before_top'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -321,9 +315,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -514,9 +505,6 @@ $result_trees{'nodes_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -572,18 +560,14 @@ $result_trees{'nodes_before_top'} = {
   'type' => 'document_root'
 };
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[0]{'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 33caeaedab..5da25829c9 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
@@ -172,9 +172,6 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -260,9 +257,6 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -305,11 +299,9 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
   }
 ];
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'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]{'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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'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 ab3490573e..b9fb503759 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -215,9 +215,6 @@ $result_trees{'novalidate'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -250,7 +247,6 @@ $result_trees{'novalidate'} = {
 };
 
$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'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'novalidate'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'novalidate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'novalidate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'novalidate'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'novalidate'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = $result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
diff --git a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index d3cfc03bc7..fc596a7464 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -81,9 +81,6 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
               ],
               'cmdname' => 'anchor',
               'extra' => {
-                'node_content' => [
-                  {}
-                ],
                 'normalized' => 'ref'
               },
               'source_info' => {
@@ -145,9 +142,6 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -179,10 +173,8 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'label'}
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'args'}[3]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 8528539a25..5de620dfac 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -29,9 +29,6 @@ $result_trees{'one_subsection_and_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -86,7 +83,6 @@ $result_trees{'one_subsection_and_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_subsection_and_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'one_subsection_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'one_subsection_and_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'one_subsection_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'one_subsection_and_node'} = '@node one node
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 354121f18e..b6ddc3d27c 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -30,9 +30,6 @@ $result_trees{'part_chapter_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -261,9 +258,6 @@ $result_trees{'part_chapter_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -324,11 +318,9 @@ $result_trees{'part_chapter_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_chapter_after_top'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
-$result_trees{'part_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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 697c3fd573..9f7fbfad73 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -216,9 +213,6 @@ $result_trees{'part_node_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -284,10 +278,8 @@ $result_trees{'part_node_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_after_top'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'args'}[0]{'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 0bff249352..92ccf43cc3 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -54,9 +54,6 @@ $result_trees{'part_node_before_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -147,9 +144,6 @@ $result_trees{'part_node_before_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -318,11 +312,9 @@ $result_trees{'part_node_before_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'part_node_before_top'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[3]{'args'}[0]{'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]{'extra'}{'associated_part'}
 = $result_trees{'part_node_before_top'}[0]{'contents'}[2];
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 90e21f8c7d..d7090c14f3 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_chapter_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -362,9 +359,6 @@ $result_trees{'part_node_chapter_after_top'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -450,9 +444,6 @@ $result_trees{'part_node_chapter_after_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -526,17 +517,14 @@ $result_trees{'part_node_chapter_after_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[3]{'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 7502dfd6dd..21ad7bba60 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_chapter_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -261,9 +258,6 @@ $result_trees{'part_node_chapter_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -368,11 +362,9 @@ $result_trees{'part_node_chapter_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
-$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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 6633e0bc84..0ab8987f57 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -309,9 +306,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -399,9 +393,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -460,16 +451,13 @@ $result_trees{'part_node_chapter_node_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
-$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
-$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
 
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 2e2b1d0c41..7af0171ffc 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_node_part_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -309,9 +306,6 @@ $result_trees{'part_node_node_part_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -399,9 +393,6 @@ $result_trees{'part_node_node_part_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -499,16 +490,13 @@ $result_trees{'part_node_node_part_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
-$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
-$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'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 b02576e4a0..b8f5906c7f 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_part_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -261,9 +258,6 @@ $result_trees{'part_node_part_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -408,11 +402,9 @@ $result_trees{'part_node_part_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_part_appendix'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
-$result_trees{'part_node_part_appendix'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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 ac2b83dfa5..8b6ec3fe0f 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -30,9 +30,6 @@ $result_trees{'part_node_part_node_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -309,9 +306,6 @@ $result_trees{'part_node_part_node_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -436,9 +430,6 @@ $result_trees{'part_node_part_node_appendix'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -499,16 +490,13 @@ $result_trees{'part_node_part_node_appendix'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
-$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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];
-$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index e3491bf5ac..b5faa82058 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -36,9 +36,6 @@ $result_trees{'protected_node_parentheses'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -295,10 +292,6 @@ $result_trees{'protected_node_parentheses'} = {
           ],
           'cmdname' => 'anchor',
           'extra' => {
-            'node_content' => [
-              {},
-              {}
-            ],
             'normalized' => '_0028manual2_0029-name2'
           },
           'source_info' => {
@@ -374,10 +367,6 @@ $result_trees{'protected_node_parentheses'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {},
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -403,17 +392,12 @@ $result_trees{'protected_node_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'protected_node_parentheses'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'protected_node_parentheses'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'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];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'extra'}{'node_content'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'args'}[0]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl 
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index 0f28b236ee..7a77ae9860 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -35,9 +35,6 @@ $result_trees{'recursive_self_section_reference'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -119,7 +116,6 @@ $result_trees{'recursive_self_section_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'recursive_self_section_reference'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'recursive_self_section_reference'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'recursive_self_section_reference'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'recursive_self_section_reference'}{'contents'}[1];
 
$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index f540863aee..81df44400a 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -36,9 +36,6 @@ $result_trees{'ref_to_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -136,7 +133,6 @@ $result_trees{'ref_to_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_top'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'ref_to_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_to_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'ref_to_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'ref_to_top'}{'contents'}[1];
 
$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl 
b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
index 0e938b9a30..64ed7ad2f3 100644
--- a/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
+++ b/tp/t/results/sectioning/reference_to_only_special_spaces_node.pl
@@ -45,9 +45,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -125,9 +122,6 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -453,9 +447,7 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'reference_to_only_special_spaces_node'}{'contents'}[3];
 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index 4eec9db3c9..3570b51163 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -72,9 +72,6 @@ $result_trees{'section_before_after_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -181,7 +178,6 @@ $result_trees{'section_before_after_top_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_before_after_top_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_before_after_top_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_before_after_top_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_before_after_top_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'section_before_after_top_node'} = '@unnumbered before
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index a7d579d5d2..7068208e80 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -72,9 +72,6 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -202,9 +199,6 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -229,9 +223,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_before_after_top_node_last_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'section_before_after_top_node_last_node'} = '@unnumbered before
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index eb346caa98..52531e0664 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -43,9 +43,6 @@ $result_trees{'section_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -131,9 +128,6 @@ $result_trees{'section_before_top'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -296,10 +290,8 @@ $result_trees{'section_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_before_top'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'section_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'section_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_before_top'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'section_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'section_before_top'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'section_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_before_top'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'section_before_top'}{'contents'}[3]{'args'}[0]{'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];
 
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 9f379af246..23e91c22ed 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -66,9 +66,6 @@ $result_trees{'section_below_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -271,9 +268,6 @@ $result_trees{'section_below_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -457,9 +451,6 @@ $result_trees{'section_below_unnumbered'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -545,13 +536,10 @@ $result_trees{'section_below_unnumbered'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_below_unnumbered'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_below_unnumbered'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_below_unnumbered'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_below_unnumbered'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'section_below_unnumbered'} = '
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 b9e0bd2074..24cdfdaa30 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -35,9 +35,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -301,9 +295,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -471,12 +462,9 @@ $result_trees{'section_chapter_before_top_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$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'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[5]{'args'}[0]{'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];
 
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 7913e6d2af..ce7da2fd6a 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -36,9 +36,6 @@ $result_trees{'section_node_before_part'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -129,7 +126,6 @@ $result_trees{'section_node_before_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_node_before_part'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'section_node_before_part'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_node_before_part'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'section_node_before_part'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'section_node_before_part'} = '
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index ad1dc2d059..7d21009987 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -29,9 +29,6 @@ $result_trees{'semi_auto'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -263,9 +260,6 @@ $result_trees{'semi_auto'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -449,9 +443,6 @@ $result_trees{'semi_auto'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -556,9 +547,6 @@ $result_trees{'semi_auto'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -626,16 +614,12 @@ $result_trees{'semi_auto'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'semi_auto'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'semi_auto'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'semi_auto'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'semi_auto'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'semi_auto'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[7]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'contents'}[0];
 
$result_trees{'semi_auto'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index c98efd71f4..867c8d991c 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -35,9 +35,6 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -157,7 +154,6 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'setfilename_on_top_and_after_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'setfilename_on_top_and_after_node'} = '@node Top
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 365ea28e72..7c3c5c9ba6 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -262,9 +262,6 @@ $result_trees{'space_in_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -312,9 +309,6 @@ $result_trees{'space_in_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -362,9 +356,6 @@ $result_trees{'space_in_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -405,9 +396,6 @@ $result_trees{'space_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -436,13 +424,9 @@ 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ext
 
$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]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 
 $result_texis{'space_in_node'} = '
diff --git a/tp/t/results/sectioning/split_for_format_not_split.pl 
b/tp/t/results/sectioning/split_for_format_not_split.pl
index cdd63eedeb..7ff3dde6a7 100644
--- a/tp/t/results/sectioning/split_for_format_not_split.pl
+++ b/tp/t/results/sectioning/split_for_format_not_split.pl
@@ -77,9 +77,6 @@ $result_trees{'split_for_format_not_split'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -114,7 +111,6 @@ $result_trees{'split_for_format_not_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_for_format_not_split'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'split_for_format_not_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'split_for_format_not_split'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'split_for_format_not_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'split_for_format_not_split'} = '\\input texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index 9db7e45f6b..733b42a3b5 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -29,9 +29,6 @@ $result_trees{'top_no_argument_and_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -76,7 +73,6 @@ $result_trees{'top_no_argument_and_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_no_argument_and_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_no_argument_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_no_argument_and_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_no_argument_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_no_argument_and_node'} = '@node start
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index 6ab4c3e7be..b7254355eb 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -29,9 +29,6 @@ $result_trees{'top_no_argument_and_top_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -76,7 +73,6 @@ $result_trees{'top_no_argument_and_top_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_no_argument_and_top_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_no_argument_and_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_no_argument_and_top_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_no_argument_and_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_no_argument_and_top_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 12b53d3c71..6f77cff418 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -190,9 +190,6 @@ $result_trees{'top_node_no_menu_direction'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -252,9 +249,6 @@ $result_trees{'top_node_no_menu_direction'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -294,9 +288,7 @@ $result_trees{'top_node_no_menu_direction'} = {
 };
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'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]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index feadf66778..6f03371103 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -43,9 +43,6 @@ $result_trees{'top_node_part_top'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -143,7 +140,6 @@ $result_trees{'top_node_part_top'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'top_node_part_top'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_part_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_part_top'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_part_top'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_part_top'}[0]{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'top_node_part_top'}[0]{'contents'}[2];
 $result_trees{'top_node_part_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_node_part_top'}[0]{'contents'}[3];
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 4ad7645439..c84a8a60ee 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -95,9 +95,6 @@ $result_trees{'top_without_node_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -179,7 +176,6 @@ $result_trees{'top_without_node_nodes'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'top_without_node_nodes'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1];
 $result_trees{'top_without_node_nodes'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2];
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index 949c97cf04..387b3aa224 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -103,9 +103,6 @@ $result_trees{'top_without_node_sections'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -188,7 +185,6 @@ $result_trees{'top_without_node_sections'} = [
   }
 ];
 $result_trees{'top_without_node_sections'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1];
-$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1];
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 8a277f0ede..bafe4ef500 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -269,9 +269,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -335,9 +332,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -445,9 +439,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -511,9 +502,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -545,16 +533,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
 
$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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'args'}[0]{'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]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$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]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'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 1d1367b4ba..abe1ae886f 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -36,9 +36,6 @@ $result_trees{'two_nodes_at_the_end'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -363,9 +360,6 @@ $result_trees{'two_nodes_at_the_end'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -482,9 +476,6 @@ $result_trees{'two_nodes_at_the_end'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -525,9 +516,6 @@ $result_trees{'two_nodes_at_the_end'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -556,20 +544,16 @@ $result_trees{'two_nodes_at_the_end'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
-$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 265adeadda..2d47796669 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -36,9 +36,6 @@ $result_trees{'two_nodes_between_chapters'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -363,9 +360,6 @@ $result_trees{'two_nodes_between_chapters'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -468,9 +462,6 @@ $result_trees{'two_nodes_between_chapters'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -519,9 +510,6 @@ $result_trees{'two_nodes_between_chapters'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -580,21 +568,17 @@ $result_trees{'two_nodes_between_chapters'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
-$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'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]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[1];
-$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index a0fa4941f3..3914b292b2 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -137,9 +137,6 @@ $result_trees{'unknown_node_in_menu'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -165,7 +162,6 @@ $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]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'unknown_node_in_menu'} = '@node first
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index 7145512eea..bfc9bf7e48 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -88,9 +88,6 @@ $result_trees{'unnumbered_before_node_top_top'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -161,7 +158,6 @@ $result_trees{'unnumbered_before_node_top_top'} = [
   }
 ];
 $result_trees{'unnumbered_before_node_top_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1];
-$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index f3a6e29c34..c419a50e20 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -105,9 +105,6 @@ $result_trees{'unnumbered_before_top_node'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -136,7 +133,6 @@ $result_trees{'unnumbered_before_top_node'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'unnumbered_before_top_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[1];
 
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index 1dee6c9a07..7841cf94c9 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -50,9 +50,6 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -224,9 +221,6 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -308,11 +302,9 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'unit_command'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1];
-$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'unit_command'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 04609145f9..4ef5d16758 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -56,9 +56,6 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -238,9 +235,6 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         ],
         'cmdname' => 'node',
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -322,12 +316,10 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
-$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[3]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index ccd2e994e4..cdc897259f 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
@@ -50,9 +50,6 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -131,9 +128,6 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -632,9 +626,7 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
diff --git 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
index 77764749b3..1aa266a4b7 100644
--- 
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
+++ 
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
@@ -50,9 +50,6 @@ $result_trees{'index_entries_relate_to_item_transformation'} 
= {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -131,9 +128,6 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       'cmdname' => 'node',
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -633,9 +627,7 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index 75d90832ae..6ea00d328f 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -88,9 +88,6 @@ $result_trees{'master_menu_fr'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -410,9 +407,6 @@ $result_trees{'master_menu_fr'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -596,9 +590,6 @@ $result_trees{'master_menu_fr'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -653,14 +644,11 @@ $result_trees{'master_menu_fr'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'master_menu_fr'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'master_menu_fr'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'master_menu_fr'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'master_menu_fr'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'master_menu_fr'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'master_menu_fr'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'master_menu_fr'}{'contents'}[3]{'args'}[0]{'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'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'master_menu_fr'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'master_menu_fr'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'master_menu_fr'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
 $result_texis{'master_menu_fr'} = '\\input texinfo.tex
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index cca89a523f..009351ff91 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -502,9 +502,6 @@ $result_trees{'value_in_index_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1036,9 +1033,6 @@ $result_trees{'value_in_index_commands'} = {
       ],
       'extra' => {
         'isindex' => 1,
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1063,7 +1057,6 @@ $result_trees{'value_in_index_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[1];
@@ -1073,7 +1066,6 @@ 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[6];
-$result_trees{'value_in_index_commands'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_in_index_commands'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
 $result_texis{'value_in_index_commands'} = '@set cp cp
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index a2d7950ed5..a6b7c85f3a 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -59,9 +59,6 @@ $result_trees{'value_in_misc_commands'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3920,9 +3917,6 @@ $result_trees{'value_in_misc_commands'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -3963,9 +3957,7 @@ $result_trees{'value_in_misc_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_in_misc_commands'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_misc_commands'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'value_in_misc_commands'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_misc_commands'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
 $result_texis{'value_in_misc_commands'} = '@set text atext
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index c34b26383b..aa2d27f994 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -114,9 +114,6 @@ $result_trees{'value_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -377,9 +374,6 @@ $result_trees{'value_in_node'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -746,9 +740,6 @@ $result_trees{'value_in_node'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -786,14 +777,12 @@ $result_trees{'value_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'value_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'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'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'value_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
@@ -801,7 +790,6 @@ 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'ext
 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}
 = $result_trees{'value_in_node'}{'contents'}[3];
 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'value_in_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index de6b2ebbda..64f9dabf8f 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -133,9 +133,6 @@ $result_trees{'value_node_directions'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -339,9 +336,6 @@ $result_trees{'value_node_directions'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -516,9 +510,6 @@ $result_trees{'value_node_directions'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -585,17 +576,14 @@ $result_trees{'value_node_directions'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'contents'}[1];
 
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'value_node_directions'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3]{'contents'}[1];
-$result_trees{'value_node_directions'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[5]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2]{'contents'}[0];
 
$result_trees{'value_node_directions'}{'contents'}[5]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3]{'contents'}[1];
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index db0137a7e2..44d3518b0a 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -742,9 +742,6 @@ $result_trees{'commands_and_spaces'} = {
           'extra' => {
             'caption' => {},
             'float_type' => 'ff',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'b',
             'shortcaption' => {}
           },
@@ -1703,9 +1700,6 @@ $result_trees{'commands_and_spaces'} = {
         }
       ],
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1748,7 +1742,6 @@ $result_trees{'commands_and_spaces'} = {
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3]{'extra'}{'float'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'caption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'shortcaption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}[0];
@@ -1759,7 +1752,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'contents'}[1];
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 07c3dbc7c7..1951fad2ae 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -833,9 +833,6 @@ $result_trees{'comments_end_lines'} = {
           ],
           'extra' => {
             'float_type' => 'f',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'g'
           },
           'info' => {
@@ -1022,7 +1019,6 @@ $result_trees{'comments_end_lines'} = {
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'columnfractions'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0];
 
 $result_texis{'comments_end_lines'} = '@itemize
 @item itemize it
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 52e7024401..d19673f1cb 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -2051,9 +2051,6 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'float_type' => 'f',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'g'
           },
           'info' => {
@@ -2253,7 +2250,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'extra'}{'columnfractions'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'args'}[1]{'contents'}[0];
 
 $result_texis{'comments_on_block_command_lines'} = '@itemize @c comm
 @item itemize it
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 ef2e52957c..74522cb062 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -99,9 +99,6 @@ $result_trees{'image_inline_or_not'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1033,9 +1030,6 @@ $result_trees{'image_inline_or_not'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1416,9 +1410,6 @@ $result_trees{'image_inline_or_not'} = {
             'caption' => {},
             'float_section' => {},
             'float_type' => 'F',
-            'node_content' => [
-              {}
-            ],
             'normalized' => 'g'
           },
           'info' => {
@@ -1448,18 +1439,15 @@ $result_trees{'image_inline_or_not'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'image_inline_or_not'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'image_inline_or_not'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$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'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'image_inline_or_not'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$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];
-$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[0];
 
 $result_texis{'image_inline_or_not'} = '@image{A}
 
diff --git a/tp/t/results/xml_tests/top_node_and_bye.pl 
b/tp/t/results/xml_tests/top_node_and_bye.pl
index a427eaeed5..95b374ffc2 100644
--- a/tp/t/results/xml_tests/top_node_and_bye.pl
+++ b/tp/t/results/xml_tests/top_node_and_bye.pl
@@ -37,9 +37,6 @@ $result_trees{'top_node_and_bye'} = [
           }
         ],
         'extra' => {
-          'node_content' => [
-            {}
-          ],
           'nodes_manuals' => [
             {
               'node_content' => [
@@ -75,7 +72,6 @@ $result_trees{'top_node_and_bye'} = [
     'type' => 'unit'
   }
 ];
-$result_trees{'top_node_and_bye'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_and_bye'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_and_bye'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_and_bye'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_and_bye'} = '@node Top
diff --git a/tp/t/results/xml_tests/top_node_no_section.pl 
b/tp/t/results/xml_tests/top_node_no_section.pl
index 2923605bfe..7d5c1e0aa0 100644
--- a/tp/t/results/xml_tests/top_node_no_section.pl
+++ b/tp/t/results/xml_tests/top_node_no_section.pl
@@ -29,9 +29,6 @@ $result_trees{'top_node_no_section'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -56,7 +53,6 @@ $result_trees{'top_node_no_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_no_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_no_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_no_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
 $result_texis{'top_node_no_section'} = '@node Top
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 958ba28274..2c28722274 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -29,9 +29,6 @@ $result_trees{'block_commands_in_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -109,9 +106,6 @@ $result_trees{'block_commands_in_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -1367,9 +1361,7 @@ $result_trees{'block_commands_in_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'block_commands_in_table'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'block_commands_in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'block_commands_in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'block_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 2bfaedfa85..94f87a2d0e 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -35,9 +35,6 @@ $result_trees{'inter_item_commands_in_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -115,9 +112,6 @@ $result_trees{'inter_item_commands_in_table'} = {
       ],
       'cmdname' => 'node',
       'extra' => {
-        'node_content' => [
-          {}
-        ],
         'nodes_manuals' => [
           {
             'node_content' => [
@@ -2611,9 +2605,7 @@ $result_trees{'inter_item_commands_in_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];



reply via email to

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